Further framework and test updates