Get all tests passing again