[BUG #8618] fixed skipAfterTest
minor
[BUG #8618] fixed test
[BUG #8618] improved tests
[BUG #8618] improved tests