Converted "old" tests to NUnit, other minor fixes