Reworking parser logic and added better tests