Holly made changes to the test cases as a result of testing RC 5
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop