Issue #6: Fixing broken tests.