tests: revamped tests
redone: nfa: slight improvements to caching