Added validations and should verb suppor to Expectation