Updating tests for Python3
Merge remote-tracking branch 'origin/production' into production-tests
Merge branch 'production' into production-tests
Merge branch 'production' into production-tests
Merge branch 'production' into production-tests