Fix for tests that I broke with the recent refactor.