HUB-148 : resolve test errors