Refactor to remove remaining stubbed functions in favor of injecting a fake