Added tests for the generic generator class