Fixing broken tests after merging Rafal's pull request on RA-156