More changes for and from testing