Initial efforts to fix broken tests