Mainly get testing up to current versions of tools