2/4 tests passing again