Misc fixes

This fixes an issue with the Makefile, now doing `make LOG_LEVEL=foo serve` works again, and the db is not dropped when the functional test is run