Update some tests to validate with factories