Re-added testing lines