Fix test suite after project structure refactor