[#547] Fix tests affected by merge