refactor tests for context range validators.

Tests checking context ranges were duplicated.
Refactor to use a single method that checks range inclusion
rename context range validators
Merge branch 'context_validation_refactoring'