Adds a few more validation tests