Refactoring introduced fluentvalidation and updated tests