Support SourceId in test messages helper

Signed-off-by: Dakota Bailey <dbailey@pivotallabs.com>