Added database creation and teardown