volatile-test: General cleanups and updates to v13 version of patchset

General cleanups for v13

Signed-off-by: John Stultz <john.stultz@linaro.org>