Updated tests, moved all tests to this project