Fix code of phpunit for DB tests
merge
solve conflict