Added tests to database
Merge