IDM-6 Improve rest unit test