open-zwave: minor test cleanup