Got tests working up to and including the simplifier. Have implemented term unification, now to get the context tests working so I can check it.