Add feedback survey to wait message (and refactor one app test to be iso...

...lated from message generator)

This implements v1 for #166