fixing tests/code from 3.6