add more tests; fix nfd