Restore test menu-32.8
Stop test litter breaking scale-19.
Get menu-32.8 and scale-19 fixes from 8.5.
merge trunk