RPS-1442 fix tests