refactored test project structure