adapt more tests to work with old python