More test updates/fixes