Minor test tweaks after Grant's simplification mods