Merge pull request #108 from daniellemayne/develop

Develop: vm, volume and fw test improvements
test mods
Merge pull request #109 from unwin/develop+RDS

test mods