Fixed tests. Added validator exception capture.