Revived tests that once depended on xml