added test and reverted the 'revert incorrect change to structure description macro'

This reverts commit 754a7584d2df0e934b7ac2b785bf70bcfeac028a.