fixing broken tests.