REPORTS-220: Changed test cases to mirror added concepts