Rework auto-qa slightly