NUnit nugget used instead of local ref
Minor test code refactoring