Holly made some more test case changes related to RC 4
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop