Add support for jaycfields/expectations test library.
Merge branch 'ray1729-expectations-support'