TQA-1254: improve test suite quality