Merge "Switch test_db_url to a directory"