Validate factories

- A couple still failing