Fix circular import

Somehow this isn't being caught by the tests--something about how app
loading works when running tests.