Changed to abstract class, implicit parameter
Adding names to Generator
Changed test names