Fixed default-properties issue
Added defaultXml suite just once
Updated test and refactor