Merge "Adapt automatic reporting to new Test API"