Fix tests broken by our demo-speed-mode :-)