compiles again, unit tests pass