Changes so tests pass