Move import; make tests more explicit