Easier switching to testing config
Improvements on database loading