Ensure test database is created
Merge branch 'master' into bootstrap