Fix some unit test compilation failures. (Forgot to make check.)