Now passing both validation tests