Updated so tests pass