more testing overhaul