Holly's test case changes for RC 3.
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop