Merged code from upstream
Merge branch 'master' of https://github.com/rayneran/minerva.git
Tidied up integration testing