Fix some unit tests that aren't working currently.