[RJA-xxx][fix] fixing failing tests
Merge pull request #844 from bugzmanov/master

[RJA-xxx][fix] fixing failing tests