pull in some of scott's more aggressive test tunings.
cleanup