Changed XML structure and first XML Tests