Cleanup after ourselves in tests

This does not resolve the dangling resources or possible
race conditions but it improves the stack output
... bonus -> tests are a little faster

Signed-off-by: Michael Fraenkel <fraenkel@us.ibm.com>
Auto-merge remote-tracking branch 'upstream/master'