Tests compile again
Most tests pass again