Revived other unit tests by adjusting X3ML files