continued test updates and fixes