Issue #200: Followup to fix broken tests.