Added tests for validators; fixed minor problems with validators