new model for the validators and new layout for the tests.