Corrected broken tests