Decode the message before reprising it in the entity
Rename test data functions so they do not start with test prefix