[RJA-xxx][fix] fixing failing tests