Post Motion testing bug fixes and features - see commit messages for details