* Fixed unit test crashes