Remove dir cmd
Fix some broken tests due to OS specific XML parsing