Start to prep for Python3 support & update demarshaling tests to reflect the name changes from type to foo_type

Both test suites pass in Python 2.7 but fail in 3