qa: more refactoring