few minor unit test updates