Tests and tweaks for movement