Fix tests related to latest publish changes