tests: update keys and fix tests
parser: reduce number of arguments