Test project refactoring