Fixed broken tests