Tests tweaked to run on all the supported versions