Fixed plural variable names to singular when generating add or remove methods for entities

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