Adjust tests to refactoring - rest will follow