Tests updates to correctly use QEMU strategy as default. Minor
corrections in test. Cosmetic changes to NodeController