Added database support for tests