Fix unit tests that were broken after last fix of #932.