ENH: updated tests
Updated for python3