Reorganize db setup scripts to work better with testing