More adaptation towards TestEx