Adding validator builder and factory plus tests