Added more tests
Added ValidationResult to Context. Minor changes for testability