misc fixes to get tests working again