Build fix after recent movement of tests.