Resolve type names
Annotate types
Support type annotations in tests