Fix up collectd kitchen tests.