Updated NUnit tests to build after prior API changes