Moved test code to a manager class, cleaned up some file names