Added database tests
Merged