Fix #5398 and #5395 - Fix tests failing due to problem creating connection for alembic