Update broken tests and fixtures for changes to io.aviso.rook.client/then

Improve the reporting of improper forms inside the then/then* macros