Also moved faker into production