Remove old_config.xml
Fix tests