More meaningful name for structure.
Add nunit intrumentation.