add tests for MPS-17312 and for MPS-17388
fix ITestCases