Refactored unit test project