Apply should to expect changes to 2.99

This differs slightly due to the changes for 3.x as it doesn't use `receive_messges`