Remove unnecessary dependencies
Add parser tests