Some simple fixes to failing tests.