Fixes to failing tests