fix tests (keys ...)