Cleanups and tweaks

Signed-off-by: Andrew Jones <drjones@redhat.com>
Merge branch 'arm-branch/initial-drop' of https://github.com/rhdrjones/kvm-unit-tests into arm-branch/initial-drop