XML Configuration support update + Tests update