Holly's final (she hopes) test case changes for RC4...
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop