One more unit test update...