all tests passing again