Improve test [RD-62]