Oops, fix unit test to import SyntaxError from right module.
Oops, adjust references to moved basic types to new module structure.