modularized the creation of validators
cranked up the test coverage