Dead code cleanup: #if 0 dropped from tests