Fix expectation context ordering