Fix unit tests + merge master + removed obsolete dataservice + rename test function
fix for deletion of entity equals
formatted code
Merge pull request #1201 from bartcharbon/master

fix tests + remove obsolete code + rename methods (based on review comments)