ANA-475: merge bugfix in the testcases