HUE-1185 Fix test cases