Refactoring of tests after project reorganization.