HR-377 test cases fixes according to HR-378 report changes