Update nss tests to new skeleton