Small changes in TestListener