Adding more validation tests, and working for fail on first