Fix tests and RA parser