overhaul of functional testing