some remaining test updates