Cosmetics + unit test updates