fixes to all failing tests due to refactor