o Added some more export tests