Cleaning up tests

Switching to Nunit