Cleaning up some weird testing imports in non-test code.