Fix remaining unit tests from deep query work.