changed xml test structure