Corrected broken tests.