Block operation before validating it. Remove redundant tests.