More parser work. Tests added