Refactor mock data to it's on file
Because it will be used from db-client tests ad well
Switch to using mock data
Add id updating to db client insertions
Also added test to cover this case