Fixed broken tests after large merge.