consolidate code on couchbase-clj; combine separate resource tests into main resource test files