Add the pupil models validation tests and get them to pass