Fix broken tests. Test failures encountered previously were due to broken tests.