Fixed more unit test crashes.