Added some tests, emma dependancy