fix test, update test expectations to match refactored code