Add test cases for TBD-928