kill test watcher when tests end by themself

Change-Id: Icd31bf06dc02d58a53d1813b0f114e78ccfd5c87
Signed-off-by: Alessandro Salvatori <sandr8@gmail.com>