Add test case for TBD-455