Test overhaul