add test cases for TBD-29