Kit validation

Data updated, tests modified and minor refactoring in kit presenter and model