Fix two unit tests that broke when re-basing.