Fix grizzly_motion/tests bugs