Upgrade test cases for 3.0
