Fixed support for correct substitution in typechecking and assigning 'this' to an lvalue
Updated test to reflect slightly different error format, and inserted indentation