Fix some unit tests that were broken at the time of cloning.