Add test case for TBD-1054