- Wrap functions hidden by CONFIG_MOTION_VAR properly in test code.
- Add some missing ampersands.

Change-Id: Ie7c4e1f14cbacec1c157c7ce110b01350b2ed78e