Cleaned up bitrot in nsswitch testsuite. Merged tests across from TNG