Fix unit tests + merge master + removed obsolete dataservice + rename test function