Fix test cases for HUE-1268