Moved some methods and fixed the tests project