Add more tests for 4 to 5 upgrade.