Add test cases for TDI-30263