Holly made some additional minor test case changes after testing VIVO-645 against develop--testing for 1.6 is now completed.