more unit test updates