All the tests now pass. Need to improve test generator.