Fixed tests on merge.