[BUG #8605] fixed test
[BUG #8605] fixed test
[BUG #8618] removed obsolete tests
[BUG #8605] fixed test
[BUG #8618] removed obsolete tests