[TEST] adjusted test cases for the rebase changes