Add support for using current database instead of a testing db