diff --git a/core-js/pom.xml b/core-js/pom.xml
index d1d20d72..9591eb2d 100644
--- a/core-js/pom.xml
+++ b/core-js/pom.xml
@@ -56,7 +56,6 @@
                     <sourceIncludes>
                         <include>Functions.js</include>
                     </sourceIncludes>
-                    <browserVersion>CHROME</browserVersion>
                 </configuration>
             </plugin>
 
diff --git a/mindplot/pom.xml b/mindplot/pom.xml
index ffe8f675..18d2c385 100644
--- a/mindplot/pom.xml
+++ b/mindplot/pom.xml
@@ -257,7 +257,7 @@
             <plugin>
                 <groupId>com.github.searls</groupId>
                 <artifactId>jasmine-maven-plugin</artifactId>
-                <version>1.3.1.4</version>
+                <version>1.3.1.5</version>
                 <executions>
                     <execution>
                         <goals>
@@ -266,12 +266,16 @@
                     </execution>
                 </executions>
                 <configuration>
+<!--
                     <browserVersion>FIREFOX_3_6</browserVersion>
                     <webDriverClassName>org.openqa.selenium.firefox.FirefoxDriver</webDriverClassName>
 
+-->
                     <sourceIncludes>
-                        <sourceInclude>libraries/mootools/mootools-core-1.4.5-full-nocompat.js</sourceInclude>
-                        <sourceInclude>header.js</sourceInclude>
+                        <include>libraries/mootools/mootools-core-1.4.5-full-nocompat-yc.js</include>
+                        <include>header.js</include>
+                        <include>libraries/jquery/jquery-2.1.0.min.js</include>
+                        <include>Events.js</include>
                     </sourceIncludes>
                     <specExcludes>
                         <exclude>static/test/*.js</exclude>
diff --git a/mindplot/src/test/javascript/EventsTestSuite.js b/mindplot/src/test/javascript/EventsTestSuite.js
new file mode 100644
index 00000000..6f2c548b
--- /dev/null
+++ b/mindplot/src/test/javascript/EventsTestSuite.js
@@ -0,0 +1,43 @@
+var TestClass = new Class({
+    Extends: mindplot.Events,
+
+    getEvents: function() {
+        return this.$events;
+    },
+
+    removeEvents: function() {
+        this.$events = {};
+    }
+});
+
+// Test class and variables
+var expectedChangeFn1 = function () {return 'change1';};
+var expectedChangeFn2 = function () {return 'change2';};
+var expectedLoadFn = function() {return 'loaded';};
+var myTestClass = new TestClass();
+
+
+describe("Events class suite", function() {
+
+    afterEach(function() {
+        myTestClass.removeEvents();
+    });
+
+    it("addEventTest", function() {
+        expect(myTestClass.getEvents()).toEqual({});
+        myTestClass.addEvent('change', expectedChangeFn1);
+        expect(myTestClass.getEvents()).toEqual({change: [expectedChangeFn1]});
+        myTestClass.addEvent('change', expectedChangeFn2);
+        expect(myTestClass.getEvents()).toEqual({change: [expectedChangeFn1, expectedChangeFn2]});
+        myTestClass.addEvent('load', expectedLoadFn);
+        expect(myTestClass.getEvents()).toEqual({change: [expectedChangeFn1, expectedChangeFn2], load: [expectedLoadFn]});
+    });
+    it("removeEventTest", function() {
+        expect(myTestClass.getEvents()).toEqual({});
+        myTestClass.addEvent('change', expectedChangeFn1);
+        myTestClass.addEvent('change', expectedChangeFn2);
+        expect(myTestClass.getEvents()).toEqual({change: [expectedChangeFn1, expectedChangeFn2]});
+        myTestClass.removeEvent('change', expectedChangeFn1);
+        expect(myTestClass.getEvents()).toEqual({change: [expectedChangeFn2]});
+    });
+});