Improve expectation modification specs