Changed golden tests to message and nunit tests.
Self-review 1