merge of #2623 v1.13.1 test fixes

fixing a bunch of minor issues found in the tests when testing v1.13.1. Notably this ensures that a number of the tests use the driver from the repository, rather than the one installed on the system.