Fix tests after berksfile merge.