Fix naming inconsistencies
Added primary test for parser