Last of the test case chances from RC2
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop