and even more test updates