Fix tests, newer is not always better