More tests and generator files