Moved when* functionality to validators
Updated to work with moved when* functionality and renamed validators
Renamed validated to follow the Python standard and made when* functionality validators