partial massage of tests back into shape