Changed generators to allow multiple user classes
Fixed tests