added working db model and test
updated files