Fixing failing tests after a commit for RA-465