A couple more factories.
More role tests.