os.unsetenv not always supported, better to delete from os.environ directly (which will call unsetenv in turn)
facepalm keyerror
Merge branch 'eeaston1' of https://github.com/ahlmss/pkglib into reorganise_testing