Commercial tests refactor

Using jasq, so no need to have a `config` argument
anally lines up the variables