Improved tests, fixed CONTEXTO problems.

Adding new tests identified some issues with how CONTEXTO evaluations
were performed in two cases.