A lot more test updates