Removed the tests for now. Rewrite them in Xtend later