Added tests and DB