Replacing instances of generate_ functions with FauxFactory methods

This is partially addressing #1378