Simplifying tests by creating envelopes and messages at the same time

Signed-off-by: Stephan Hagemann <stephan@pivotallabs.com>