Updated test cases for this branch