Updates to support the current changes to NUnit.