Holly update more test cases due to RC 2 testing...
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop