More test updates

More test updates