fixing tests for refactor