The short variable names are used all over test_common.... test_common does need a refactoring, though I think that is out of the scope of this quick-fix pr ;)