Added reserved motor param for compatibility. Fixed up tests