Reverted testing changes