Add tests
Add noParse + second option
fix merge conflicts