test coverage + refactoring validators