diff --git a/html/videoPlayer_template.html b/html/videoPlayer_template.html
index 0da5fe4..051d7e1 100644
--- a/html/videoPlayer_template.html
+++ b/html/videoPlayer_template.html
@@ -54,8 +54,7 @@
                         </ul>
                     </div>
         
-                    <button id="fullscreen" type="button" class="flc-videoPlayer-fullscreen fl-videoPlayer-optional fl-videoPlayer-button">
-                    </button>
+                    <button id="fullscreen" type="button" class="flc-videoPlayer-fullscreen fl-videoPlayer-optional fl-videoPlayer-button"></button>
                 </div>
             </div>
         </div>
diff --git a/tests/js/ToggleButtonTests.js b/tests/js/ToggleButtonTests.js
index 8d70441..bd2fbc9 100644
--- a/tests/js/ToggleButtonTests.js
+++ b/tests/js/ToggleButtonTests.js
@@ -34,15 +34,15 @@ fluid.registerNamespace("fluid.tests");
                 button: ".test-toggle-button"
             }
         };
-        fluid.tests.initToggleButton = function (container, testOpts) {
+        fluid.tests.initToggleButton = function (testOpts) {
             var opts = fluid.copy(baseToggleButtonOpts);
             $.extend(true, opts, testOpts);
-            return fluid.toggleButton(container, opts);
+            return fluid.toggleButton("#basic-toggle-button-test", opts);
         };
 
         toggleButtonTests.asyncTest("State change", function () {
             jqUnit.expect(3);
-            var testComponent = fluid.tests.initToggleButton("#basic-toggle-button-test", {
+            var testComponent = fluid.tests.initToggleButton({
                 listeners: {
                     onReady: function (that) {
                         jqUnit.assertEquals("Initial state should be 'false'", false, that.readIndirect("modelPath"));
@@ -59,7 +59,7 @@ fluid.registerNamespace("fluid.tests");
 
         toggleButtonTests.asyncTest("onPress event", function () {
             jqUnit.expect(1);
-            var testComponent = fluid.tests.initToggleButton("#basic-toggle-button-test", {
+            var testComponent = fluid.tests.initToggleButton({
                 listeners: {
                     onReady: function (that) {
                         var toggleButton = that.locate("button");
@@ -76,7 +76,7 @@ fluid.registerNamespace("fluid.tests");
         toggleButtonTests.asyncTest("Press", function () {
             jqUnit.expect(3);
             var testComponent;
-            testComponent = fluid.tests.initToggleButton("#basic-toggle-button-test", {
+            testComponent = fluid.tests.initToggleButton({
                 listeners: {
                     onReady: function (that) {
                         jqUnit.assertEquals("Initial state should be 'false'", false, that.readIndirect("modelPath"));
@@ -92,7 +92,7 @@ fluid.registerNamespace("fluid.tests");
         });
 
         toggleButtonTests.asyncTest("Default integrated functionality", function () {
-            var testComponent = fluid.tests.initToggleButton("#basic-toggle-button-test", {
+            var testComponent = fluid.tests.initToggleButton({
                 listeners: {
                     onPress: fluid.tests.onPressEventHandler,
                     onReady: function (that) {
@@ -115,7 +115,7 @@ fluid.registerNamespace("fluid.tests");
                 press: "press me",
                 release: "release me"
             };
-            var testComponent = fluid.tests.initToggleButton("#basic-toggle-button-test", {
+            var testComponent = fluid.tests.initToggleButton({
                 strings: testStrings,
                 listeners: {
                     onReady: function (that) {
@@ -142,7 +142,7 @@ fluid.registerNamespace("fluid.tests");
                     press: "press me",
                     release: "release me"
                 },
-                testComponent = fluid.tests.initToggleButton("#basic-toggle-button-test", {
+                testComponent = fluid.tests.initToggleButton({
                     invokers: {
                         tooltipContentFunction: {
                             funcName: "fluid.tests.tooltipContentFunction"
@@ -161,7 +161,7 @@ fluid.registerNamespace("fluid.tests");
 
         toggleButtonTests.asyncTest("Label text", function () {
             jqUnit.expect(2);
-            fluid.tests.initToggleButton("#basic-toggle-button-test", {
+            fluid.tests.initToggleButton({
                 listeners: {
                     onReady: function (that) {
                         jqUnit.assertEquals("Content should contain press label text", that.options.strings.press, that.locate("button").attr("aria-label"));