Fixing validators and creating unit tests for them.