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

[RJA-xxx][fix] fixing tests