Final changes to aho-corasick test generator

Signed-off-by: Andrew Tselischev <andrewtselischev@gmail.com>