Also add SchemaEvolutionTest to help test this kind of thing. Fixes #3627 and includes test for #3625.