fixing things so tests pass