diff --git a/pwd/session_test.go b/pwd/session_test.go
index 8d0a003..514e546 100644
--- a/pwd/session_test.go
+++ b/pwd/session_test.go
@@ -12,6 +12,8 @@ func TestSessionNew(t *testing.T) {
 	config.PWDContainerName = "pwd"
 	var connectContainerName, connectNetworkName, connectIP string
 	createdNetworkId := ""
+	saveCalled := false
+	expectedSessions := map[string]*Session{}
 
 	docker := &mockDocker{}
 	docker.createNetwork = func(id string) error {
@@ -33,12 +35,17 @@ func TestSessionNew(t *testing.T) {
 
 	broadcast := &mockBroadcast{}
 	storage := &mockStorage{}
+	storage.save = func() error {
+		saveCalled = true
+		return nil
+	}
 
 	p := NewPWD(docker, tasks, broadcast, storage)
 
 	before := time.Now()
 
 	s, e := p.SessionNew(time.Hour, "", "")
+	expectedSessions[s.Id] = s
 
 	assert.Nil(t, e)
 	assert.NotNil(t, s)
@@ -52,6 +59,7 @@ func TestSessionNew(t *testing.T) {
 	assert.True(t, s.Ready)
 
 	s, _ = p.SessionNew(time.Hour, "stackPath", "stackName")
+	expectedSessions[s.Id] = s
 
 	assert.Equal(t, "stackPath", s.Stack)
 	assert.Equal(t, "stackName", s.StackName)
@@ -66,4 +74,7 @@ func TestSessionNew(t *testing.T) {
 	assert.Equal(t, "10.0.0.1", s.PwdIpAddress)
 
 	assert.Equal(t, s, scheduledSession)
+
+	assert.Equal(t, expectedSessions, sessions)
+	assert.True(t, saveCalled)
 }
diff --git a/pwd/storage_mock_test.go b/pwd/storage_mock_test.go
index 1144120..197c8f2 100644
--- a/pwd/storage_mock_test.go
+++ b/pwd/storage_mock_test.go
@@ -1,11 +1,19 @@
 package pwd
 
 type mockStorage struct {
+	save func() error
+	load func() error
 }
 
 func (m *mockStorage) Save() error {
+	if m.save != nil {
+		return m.save()
+	}
 	return nil
 }
 func (m *mockStorage) Load() error {
+	if m.load != nil {
+		return m.load()
+	}
 	return nil
 }