Unreviewed WPE gardening. Adding and adjusting a bunch of expectations