Overhaul and testing