Test before overhaul