More RC 2 test case updates from Holly
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop