Upgrade tests for 5.13