tweaks to get tests working again.