fix tests where 'order' was not defined.  tidy