Update tested versions
Minor refactoring.