More parser functionality + tests