Fix related to 5702b7, db_api related tests