fixed tests due to the changes caused by refactoring