clean up test tool

Signed-off-by: Iliyan Malchev <malchev@google.com>