Fix typo in Context; More tests