DB Model find fix and unit tests