TQA-1254: improve testsuite to make systems work together