More unit test updates