Refactor EditEntity Api Test

When refactoring I actually noticed that even
though the tests  appeared to check error codes
they just didnt... all error codes recently changed
and none of these tests broke... fixed now!
Change-Id: I944289f4692c5fc36c8738afa41b615489263d63
Merge "Refactor EditEntity Api Test"