This also employs smart pointers for some variables in Test, and
drops unused code which b3edb241
left behind.

Change-Id: I6c19d4b8f65b057bad2106c3e9d081446a2619a1
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>