[3.1.0] Implemented redundant validators and tests