Changed generateEntityStubMethod so that variable names in add or remove methods are singular too
Edited tests for EntityGenerator so that variable names are checked too
Fixed test