Fix some tests
Resolve daisy/xprocspec/issues/20
Bugfix in catalog.xml support
Add integration test for catalog.xml support

thanks to josteinaj