Re-Factor tests to use base.OpenDbConnection() so we can control life-cycle of dbConn
Merge branch 'master' into v3