Finish underlying DFA (I think), add some test data