More changes to tune old and new tests