Move tests to use NUnit, add a couple of new resources