diff --git a/commonspace/mock_commonspace/mock_commonspace.go b/commonspace/mock_commonspace/mock_commonspace.go
new file mode 100644
index 00000000..1ada3f37
--- /dev/null
+++ b/commonspace/mock_commonspace/mock_commonspace.go
@@ -0,0 +1,286 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: github.com/anyproto/any-sync/commonspace (interfaces: Space)
+
+// Package mock_commonspace is a generated GoMock package.
+package mock_commonspace
+
+import (
+	context "context"
+	reflect "reflect"
+	time "time"
+
+	commonspace "github.com/anyproto/any-sync/commonspace"
+	headsync "github.com/anyproto/any-sync/commonspace/headsync"
+	syncacl "github.com/anyproto/any-sync/commonspace/object/acl/syncacl"
+	objectsync "github.com/anyproto/any-sync/commonspace/objectsync"
+	objecttreebuilder "github.com/anyproto/any-sync/commonspace/objecttreebuilder"
+	spacestorage "github.com/anyproto/any-sync/commonspace/spacestorage"
+	spacesyncproto "github.com/anyproto/any-sync/commonspace/spacesyncproto"
+	syncstatus "github.com/anyproto/any-sync/commonspace/syncstatus"
+	peer "github.com/anyproto/any-sync/net/peer"
+	gomock "go.uber.org/mock/gomock"
+)
+
+// MockSpace is a mock of Space interface.
+type MockSpace struct {
+	ctrl     *gomock.Controller
+	recorder *MockSpaceMockRecorder
+}
+
+// MockSpaceMockRecorder is the mock recorder for MockSpace.
+type MockSpaceMockRecorder struct {
+	mock *MockSpace
+}
+
+// NewMockSpace creates a new mock instance.
+func NewMockSpace(ctrl *gomock.Controller) *MockSpace {
+	mock := &MockSpace{ctrl: ctrl}
+	mock.recorder = &MockSpaceMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use.
+func (m *MockSpace) EXPECT() *MockSpaceMockRecorder {
+	return m.recorder
+}
+
+// Acl mocks base method.
+func (m *MockSpace) Acl() syncacl.SyncAcl {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Acl")
+	ret0, _ := ret[0].(syncacl.SyncAcl)
+	return ret0
+}
+
+// Acl indicates an expected call of Acl.
+func (mr *MockSpaceMockRecorder) Acl() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Acl", reflect.TypeOf((*MockSpace)(nil).Acl))
+}
+
+// Close mocks base method.
+func (m *MockSpace) Close() error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Close")
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// Close indicates an expected call of Close.
+func (mr *MockSpaceMockRecorder) Close() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockSpace)(nil).Close))
+}
+
+// DebugAllHeads mocks base method.
+func (m *MockSpace) DebugAllHeads() []headsync.TreeHeads {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "DebugAllHeads")
+	ret0, _ := ret[0].([]headsync.TreeHeads)
+	return ret0
+}
+
+// DebugAllHeads indicates an expected call of DebugAllHeads.
+func (mr *MockSpaceMockRecorder) DebugAllHeads() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DebugAllHeads", reflect.TypeOf((*MockSpace)(nil).DebugAllHeads))
+}
+
+// DeleteTree mocks base method.
+func (m *MockSpace) DeleteTree(arg0 context.Context, arg1 string) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "DeleteTree", arg0, arg1)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// DeleteTree indicates an expected call of DeleteTree.
+func (mr *MockSpaceMockRecorder) DeleteTree(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteTree", reflect.TypeOf((*MockSpace)(nil).DeleteTree), arg0, arg1)
+}
+
+// Description mocks base method.
+func (m *MockSpace) Description() (commonspace.SpaceDescription, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Description")
+	ret0, _ := ret[0].(commonspace.SpaceDescription)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// Description indicates an expected call of Description.
+func (mr *MockSpaceMockRecorder) Description() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Description", reflect.TypeOf((*MockSpace)(nil).Description))
+}
+
+// GetNodePeers mocks base method.
+func (m *MockSpace) GetNodePeers(arg0 context.Context) ([]peer.Peer, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetNodePeers", arg0)
+	ret0, _ := ret[0].([]peer.Peer)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetNodePeers indicates an expected call of GetNodePeers.
+func (mr *MockSpaceMockRecorder) GetNodePeers(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetNodePeers", reflect.TypeOf((*MockSpace)(nil).GetNodePeers), arg0)
+}
+
+// HandleMessage mocks base method.
+func (m *MockSpace) HandleMessage(arg0 context.Context, arg1 objectsync.HandleMessage) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "HandleMessage", arg0, arg1)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// HandleMessage indicates an expected call of HandleMessage.
+func (mr *MockSpaceMockRecorder) HandleMessage(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleMessage", reflect.TypeOf((*MockSpace)(nil).HandleMessage), arg0, arg1)
+}
+
+// HandleRangeRequest mocks base method.
+func (m *MockSpace) HandleRangeRequest(arg0 context.Context, arg1 *spacesyncproto.HeadSyncRequest) (*spacesyncproto.HeadSyncResponse, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "HandleRangeRequest", arg0, arg1)
+	ret0, _ := ret[0].(*spacesyncproto.HeadSyncResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// HandleRangeRequest indicates an expected call of HandleRangeRequest.
+func (mr *MockSpaceMockRecorder) HandleRangeRequest(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleRangeRequest", reflect.TypeOf((*MockSpace)(nil).HandleRangeRequest), arg0, arg1)
+}
+
+// HandleSyncRequest mocks base method.
+func (m *MockSpace) HandleSyncRequest(arg0 context.Context, arg1 *spacesyncproto.ObjectSyncMessage) (*spacesyncproto.ObjectSyncMessage, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "HandleSyncRequest", arg0, arg1)
+	ret0, _ := ret[0].(*spacesyncproto.ObjectSyncMessage)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// HandleSyncRequest indicates an expected call of HandleSyncRequest.
+func (mr *MockSpaceMockRecorder) HandleSyncRequest(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleSyncRequest", reflect.TypeOf((*MockSpace)(nil).HandleSyncRequest), arg0, arg1)
+}
+
+// Id mocks base method.
+func (m *MockSpace) Id() string {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Id")
+	ret0, _ := ret[0].(string)
+	return ret0
+}
+
+// Id indicates an expected call of Id.
+func (mr *MockSpaceMockRecorder) Id() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Id", reflect.TypeOf((*MockSpace)(nil).Id))
+}
+
+// Init mocks base method.
+func (m *MockSpace) Init(arg0 context.Context) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Init", arg0)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// Init indicates an expected call of Init.
+func (mr *MockSpaceMockRecorder) Init(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockSpace)(nil).Init), arg0)
+}
+
+// SetDeleted mocks base method.
+func (m *MockSpace) SetDeleted(arg0 bool) {
+	m.ctrl.T.Helper()
+	m.ctrl.Call(m, "SetDeleted", arg0)
+}
+
+// SetDeleted indicates an expected call of SetDeleted.
+func (mr *MockSpaceMockRecorder) SetDeleted(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDeleted", reflect.TypeOf((*MockSpace)(nil).SetDeleted), arg0)
+}
+
+// Storage mocks base method.
+func (m *MockSpace) Storage() spacestorage.SpaceStorage {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Storage")
+	ret0, _ := ret[0].(spacestorage.SpaceStorage)
+	return ret0
+}
+
+// Storage indicates an expected call of Storage.
+func (mr *MockSpaceMockRecorder) Storage() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Storage", reflect.TypeOf((*MockSpace)(nil).Storage))
+}
+
+// StoredIds mocks base method.
+func (m *MockSpace) StoredIds() []string {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "StoredIds")
+	ret0, _ := ret[0].([]string)
+	return ret0
+}
+
+// StoredIds indicates an expected call of StoredIds.
+func (mr *MockSpaceMockRecorder) StoredIds() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoredIds", reflect.TypeOf((*MockSpace)(nil).StoredIds))
+}
+
+// SyncStatus mocks base method.
+func (m *MockSpace) SyncStatus() syncstatus.StatusUpdater {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SyncStatus")
+	ret0, _ := ret[0].(syncstatus.StatusUpdater)
+	return ret0
+}
+
+// SyncStatus indicates an expected call of SyncStatus.
+func (mr *MockSpaceMockRecorder) SyncStatus() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncStatus", reflect.TypeOf((*MockSpace)(nil).SyncStatus))
+}
+
+// TreeBuilder mocks base method.
+func (m *MockSpace) TreeBuilder() objecttreebuilder.TreeBuilder {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "TreeBuilder")
+	ret0, _ := ret[0].(objecttreebuilder.TreeBuilder)
+	return ret0
+}
+
+// TreeBuilder indicates an expected call of TreeBuilder.
+func (mr *MockSpaceMockRecorder) TreeBuilder() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TreeBuilder", reflect.TypeOf((*MockSpace)(nil).TreeBuilder))
+}
+
+// TryClose mocks base method.
+func (m *MockSpace) TryClose(arg0 time.Duration) (bool, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "TryClose", arg0)
+	ret0, _ := ret[0].(bool)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// TryClose indicates an expected call of TryClose.
+func (mr *MockSpaceMockRecorder) TryClose(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TryClose", reflect.TypeOf((*MockSpace)(nil).TryClose), arg0)
+}
diff --git a/commonspace/spaceservice.go b/commonspace/spaceservice.go
index 7c4c79ee..eeb8a26e 100644
--- a/commonspace/spaceservice.go
+++ b/commonspace/spaceservice.go
@@ -1,3 +1,4 @@
+//go:generate mockgen -destination mock_commonspace/mock_commonspace.go github.com/anyproto/any-sync/commonspace Space
 package commonspace
 
 import (