add test cases for TBD-1046