Made the features check the contents of the generated files
Fixed broken tests