re-worked all unit tests as NUnit tests