added db test lines
fixed oid somehow
Fixed ObjectID dependencies with refactoring and crying