Mostly test updates