BT test cases: test code clean up.