Moved tests to main/test