Much less flaky faker in factory