Some renames and completes code coverage model
Prepares xml reading