Unit-test updates