NF density: added new TAGs, renamed test suites and test cases per final agreed scheme.