fixed tests in line with refactoring