fixes to failing tests