Brand new validation and many new testes