AS7-6318 improving testsuite