Remove remaining instances of nullok in passwd blocks
tst case changes to fix whitespace issue.