Moved tests to test package