ADEN-1376 Fix test cases