Reverted testing code