New version passes all tests