ADEN-607 more reliable test cases