BUGFIX Client Edit - entities weren't being added up to 2.
Now Tested for
Refactored create and update spec code to have a shared test code.