Removed custom deserialization code from questionnaire, tweaked tip deserialization to rely on field parser rather than custom parsing Fixed xml test fixtures
