Tests: cleanup
Tests: output alignment table on separate line
Moved graph/token match utility classes