Validator refactoring, tests
Solvers started, minor changes