Refactored both projects to incorporate testing.