adding more functionality, time to clean up code, where are have my tests gone??