fix parser
fix tests stats and keys