commend in tests
solved merge conflict in dbtests.py