Remove public
Added DB tests