Remove xml; use directory for unit tests