Fix tests, improve setspeed