Small improvements on dbus testing program