Db2 refactor
This merge upgrades the testbot and refactors test to make use of db2. It also has some small, various fixes around variable names and increased error messages.
This merge upgrades the testbot and refactors test to make use of db2. It also has some small, various fixes around variable names and increased error messages.