Some test updates