Moved around files and test functions work now