[BUG #8618] fixed tests
[BUG #8618] fixed tests