IDM-6 Improve core service unit test