Minor bugfixes and test case adjustments for version 2 test cases to work

with version 3. (CVS 1598)

FossilOrigin-Name: e21a181376d4115c7dbe614f3f8a1fbf82d77c75