QA: untangle steps in language test

refactoring for great good

Change-Id: I3c8981fc2a29cc78476ddd28822353c467e68f13
Merge "QA: untangle steps in language test"