Updated test cases for v3 compatibility