TimeTrackr- Cleanup and testing