changed test project structure