Fixes for Python3 tests. refs #24

+ cleanup for changes introduced in #28