Brian: Fixing broken tests.