A few more test updates