Moved tests to test