Added database and tests
Added database and tests