Fix package.json
Minor improvements parser and tests