modified the model, the tests and services
added questionnaire xml to save results via JAXB