More work on motor test