Add a number of generator tests, pending an enum fix