Fixes tests from merge.