odfexport is a superset of odfimport  so i would suggest not touching odfimport here  and move all the test code to odfexport  the only difference between the two suites is that import does import only  while export does import export import  as described in sw qa extras readme