Clearer message structure and the corresponding unit test.