RA-304 Fixing tests