diff --git a/packages/web2d/test/javascript/render/curvedLine.html b/packages/web2d/test/javascript/render/curvedLine.html
index 40eafb89..f17c9b8f 100644
--- a/packages/web2d/test/javascript/render/curvedLine.html
+++ b/packages/web2d/test/javascript/render/curvedLine.html
@@ -14,8 +14,6 @@
 
         web2d.peer.utils = {};
     </script> 
-
-    <script type="text/javascript" src="utils.js"></script>
     <script type="text/javascript">
         function initialize() {
             web2d.Toolkit.init();
diff --git a/packages/web2d/test/javascript/render/events.html b/packages/web2d/test/javascript/render/events.html
index 834abc0e..9c4fb692 100755
--- a/packages/web2d/test/javascript/render/events.html
+++ b/packages/web2d/test/javascript/render/events.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
     <script type="text/javascript">
         web2d = {
@@ -19,7 +20,6 @@
             float: left;
             margin: 10px;
         }
-
     </style>
 
     <script type="text/javascript">
@@ -29,10 +29,11 @@
             this._element = element;
             this._type = type;
             this._listener = function logger(event) {
-                var oldColor = this.getAttribute('fillColor');
-                this.setFill("yellow");
-                alert("Event on:" + this.getType() + ", Type:" + type);
-                this.setFill(oldColor);
+                var oldColor = element.getAttribute('fillColor');
+                element.setFill("yellow");
+          
+                alert("Event on:" + element.getType() + ", Type:" + type);
+                element.setFill(oldColor);
             };
         }
 
@@ -63,7 +64,7 @@
         }
 
         MultipleEventHandler.prototype.listenerCount = function () {
-            return  this._listeners.length;
+            return this._listeners.length;
         }
 
         MultipleEventHandler.prototype.unRegisterOneListener = function () {
@@ -131,140 +132,143 @@
 
 <body onload="initialize();">
 
-<script type="text/javascript">
+    <script type="text/javascript">
     //    Logger.setEnabled(true);
-</script>
+    </script>
 
-<h1>Elements Event Handling</h1>
+    <h1>Elements Event Handling</h1>
 
-<table border="1">
-    <colgroup style="width:80%;">
-        <col style="width:30%"/>
-        <col style="width:60%"/>
-    </colgroup>
-    <tbody>
-    <tr>
-        <td>
-            This examples shows the ability to attach listeners to handle several events.
-            In this example, you can attach different events to three elements: workspace, small elipse and the big
-            elipse.
-            Events will follow the event bubbling behaviour.
-        </td>
-        <td>
-            <div id="workspaceContainer" style="float:left;"></div>
+    <table border="1">
+        <colgroup style="width:80%;">
+            <col style="width:30%" />
+            <col style="width:60%" />
+        </colgroup>
+        <tbody>
+            <tr>
+                <td>
+                    This examples shows the ability to attach listeners to handle several events.
+                    In this example, you can attach different events to three elements: workspace, small elipse and the
+                    big
+                    elipse.
+                    Events will follow the event bubbling behaviour.
+                </td>
+                <td>
+                    <div id="workspaceContainer" style="float:left;"></div>
 
-            <div class="eventForm">
-                <form action="">
-                    <fieldset>
-                        <legend>Workspace Events</legend>
-                        <label>Click Event:
-                            <input type="button" value="Register"
-                                   onclick="(!wClickEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
-                        </label><br/>
-                        <label>Double Click Event:
-                            <input type="button" value="Register"
-                                   onclick="(!wDblCickEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
-                        </label><br/>
-                        <label>Mouse Over Event:
-                            <input type="button" value="Register"
-                                   onclick="(!wMouseoverEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
-                        </label><br/>
-                        <label>Mouse Out Event:
-                            <input type="button" value="Register"
-                                   onclick="(!wMouseoutEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
-                        </label><br/>
-                        <label>Mouse Move Event:
-                            <input type="button" value="Register"
-                                   onclick="(!wMousemoveEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
-                        </label>
-                    </fieldset>
-                </form>
+                    <div class="eventForm">
+                        <form action="">
+                            <fieldset>
+                                <legend>Workspace Events</legend>
+                                <label>Click Event:
+                                    <input type="button" value="Register"
+                                        onclick="(!wClickEventLogger.changeState())?this.value='Register':this.value='Unregister'" />
+                                </label><br />
+                                <label>Double Click Event:
+                                    <input type="button" value="Register"
+                                        onclick="(!wDblCickEventLogger.changeState())?this.value='Register':this.value='Unregister'" />
+                                </label><br />
+                                <label>Mouse Over Event:
+                                    <input type="button" value="Register"
+                                        onclick="(!wMouseoverEventLogger.changeState())?this.value='Register':this.value='Unregister'" />
+                                </label><br />
+                                <label>Mouse Out Event:
+                                    <input type="button" value="Register"
+                                        onclick="(!wMouseoutEventLogger.changeState())?this.value='Register':this.value='Unregister'" />
+                                </label><br />
+                                <label>Mouse Move Event:
+                                    <input type="button" value="Register"
+                                        onclick="(!wMousemoveEventLogger.changeState())?this.value='Register':this.value='Unregister'" />
+                                </label>
+                            </fieldset>
+                        </form>
 
-                <form action="">
-                    <fieldset>
-                        <legend>Small Elipse Events</legend>
-                        <label>Click Event:
-                            <input type="button" value="Register"
-                                   onclick="(!esClickEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
-                        </label><br/>
-                        <label>Double Click Event:
-                            <input type="button" value="Register"
-                                   onclick="(!esDblCickEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
-                        </label><br/>
-                        <label>Mouse Over Event:
-                            <input type="button" value="Register"
-                                   onclick="(!esMouseoverEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
-                        </label><br/>
-                        <label>Mouse Out Event:
-                            <input type="button" value="Register"
-                                   onclick="(!esMouseoutEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
-                        </label><br/>
-                        <label>Mouse Move Event:
-                            <input type="button" value="Register"
-                                   onclick="(!esMousemoveEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
-                        </label>
-                    </fieldset>
-                </form>
+                        <form action="">
+                            <fieldset>
+                                <legend>Small Elipse Events</legend>
+                                <label>Click Event:
+                                    <input type="button" value="Register"
+                                        onclick="(!esClickEventLogger.changeState())?this.value='Register':this.value='Unregister'" />
+                                </label><br />
+                                <label>Double Click Event:
+                                    <input type="button" value="Register"
+                                        onclick="(!esDblCickEventLogger.changeState())?this.value='Register':this.value='Unregister'" />
+                                </label><br />
+                                <label>Mouse Over Event:
+                                    <input type="button" value="Register"
+                                        onclick="(!esMouseoverEventLogger.changeState())?this.value='Register':this.value='Unregister'" />
+                                </label><br />
+                                <label>Mouse Out Event:
+                                    <input type="button" value="Register"
+                                        onclick="(!esMouseoutEventLogger.changeState())?this.value='Register':this.value='Unregister'" />
+                                </label><br />
+                                <label>Mouse Move Event:
+                                    <input type="button" value="Register"
+                                        onclick="(!esMousemoveEventLogger.changeState())?this.value='Register':this.value='Unregister'" />
+                                </label>
+                            </fieldset>
+                        </form>
 
-                <form action="">
-                    <fieldset>
-                        <legend>Big Elipse Events</legend>
-                        <label>Click Event:
-                            <input type="button" value="Register"
-                                   onclick="(!ebClickEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
-                        </label><br/>
-                        <label>Double Click Event:
-                            <input type="button" value="Register"
-                                   onclick="(!ebDblCickEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
-                        </label><br/>
-                        <label>Mouse Over Event:
-                            <input type="button" value="Register"
-                                   onclick="(!ebMouseoverEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
-                        </label><br/>
-                        <label>Mouse Out Event:
-                            <input type="button" value="Register"
-                                   onclick="(!ebMouseoutEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
-                        </label><br/>
-                        <label>Mouse Move Event:
-                            <input type="button" value="Register"
-                                   onclick="(!ebMousemoveEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
-                        </label>
-                    </fieldset>
-                </form>
+                        <form action="">
+                            <fieldset>
+                                <legend>Big Elipse Events</legend>
+                                <label>Click Event:
+                                    <input type="button" value="Register"
+                                        onclick="(!ebClickEventLogger.changeState())?this.value='Register':this.value='Unregister'" />
+                                </label><br />
+                                <label>Double Click Event:
+                                    <input type="button" value="Register"
+                                        onclick="(!ebDblCickEventLogger.changeState())?this.value='Register':this.value='Unregister'" />
+                                </label><br />
+                                <label>Mouse Over Event:
+                                    <input type="button" value="Register"
+                                        onclick="(!ebMouseoverEventLogger.changeState())?this.value='Register':this.value='Unregister'" />
+                                </label><br />
+                                <label>Mouse Out Event:
+                                    <input type="button" value="Register"
+                                        onclick="(!ebMouseoutEventLogger.changeState())?this.value='Register':this.value='Unregister'" />
+                                </label><br />
+                                <label>Mouse Move Event:
+                                    <input type="button" value="Register"
+                                        onclick="(!ebMousemoveEventLogger.changeState())?this.value='Register':this.value='Unregister'" />
+                                </label>
+                            </fieldset>
+                        </form>
 
-            </div>
-        </td>
+                    </div>
+                </td>
 
 
-    </tr>
-    <tr>
-        <td>Multiple listeners can be attached to an element to handle an event type.
-            In this example, multiple listeners can be registered to the elipse element to handle the click event type.
-        </td>
-        <td>
-            <div id="workspaceMultipleEvents" style="float:left;"></div>
+            </tr>
+            <tr>
+                <td>Multiple listeners can be attached to an element to handle an event type.
+                    In this example, multiple listeners can be registered to the elipse element to handle the click
+                    event type.
+                </td>
+                <td>
+                    <div id="workspaceMultipleEvents" style="float:left;"></div>
 
-            <div class="eventForm">
-                <form action="">
-                    <fieldset>
-                        <legend>Elipse Click Events Listeners</legend>
-                        <label>Registered Listeners #:
-                            <input type="text" disabled="disabled" value="0" id="listenerCounter" maxlength="2"
-                                   size="2"/>
-                        </label>
-                        <br/>
-                        <input type="button" value="Register Listener"
-                               onclick="multipleHandler.registerOneListener();$('#listenerCounter').first().value=multipleHandler.listenerCount();"/>
-                        <input type="button" value="UnRegister Listener"
-                               onclick="multipleHandler.unRegisterOneListener();$('#listenerCounter').first().value=multipleHandler.listenerCount();"/>
-                    </fieldset>
+                    <div class="eventForm">
+                        <form action="">
+                            <fieldset>
+                                <legend>Elipse Click Events Listeners</legend>
+                                <label>Registered Listeners #:
+                                    <input type="text" disabled="disabled" value="0" id="listenerCounter" maxlength="2"
+                                        size="2" />
+                                </label>
+                                <br />
+                                <input type="button" value="Register Listener"
+                                    onclick="multipleHandler.registerOneListener();$('#listenerCounter').first().value=multipleHandler.listenerCount();" />
+                                <input type="button" value="UnRegister Listener"
+                                    onclick="multipleHandler.unRegisterOneListener();$('#listenerCounter').first().value=multipleHandler.listenerCount();" />
+                            </fieldset>
 
-                </form>
+                        </form>
 
-            </div>
-        </td>
-    </tr>
-    </tbody>
-</table>
+                    </div>
+                </td>
+            </tr>
+        </tbody>
+    </table>
 </body>
-</html>
+
+</html>
\ No newline at end of file
