More changes for new tests