parser tests added / bug fixes accordingly