Add overall testing and fix Parser code.