Fix unit tests for 7cee92f.