DB connection tests, unconclusive
Merge origin/master