get most tests working again.