replace with add semantics (tested)
fixed tests, failing with different order of erros
safe delete for PATCH
Merge branch 'develop' into patch_fixes
change name of test services