Added unit tests for validators