Ensures functional tests clean up their database use
Merge pull request #312 from laserval/functional-tests-db-cleanup

Ensures functional tests clean up their database use