Fixed a few broken tests