separate database data from logic
adding separation data test,
adding onConflict method test,
onConflict implementation