More changes towards TestEx