Fix after refactoring of tests