Resolved typemaps.py unit test failure, #554