diff --git a/07-01-publishing-domain-events/internal/course.go b/07-01-publishing-domain-events/internal/course.go
index 9d87611..902b9b4 100644
--- a/07-01-publishing-domain-events/internal/course.go
+++ b/07-01-publishing-domain-events/internal/course.go
@@ -141,7 +141,7 @@ func (c *Course) Record(evt event.Event) {
 }
 
 // PullEvents returns all the recorded domain events.
-func (c Course) PullEvents() []event.Event {
+func (c *Course) PullEvents() []event.Event {
 	evt := c.events
 	c.events = []event.Event{}
 
diff --git a/07-02-domain-events-subscriber/internal/course.go b/07-02-domain-events-subscriber/internal/course.go
index b1cc3cd..7d04195 100644
--- a/07-02-domain-events-subscriber/internal/course.go
+++ b/07-02-domain-events-subscriber/internal/course.go
@@ -141,7 +141,7 @@ func (c *Course) Record(evt event.Event) {
 }
 
 // PullEvents returns all the recorded domain events.
-func (c Course) PullEvents() []event.Event {
+func (c *Course) PullEvents() []event.Event {
 	evt := c.events
 	c.events = []event.Event{}
 
diff --git a/07-03-event-bus-implementation/internal/course.go b/07-03-event-bus-implementation/internal/course.go
index 1a9799f..e19a630 100644
--- a/07-03-event-bus-implementation/internal/course.go
+++ b/07-03-event-bus-implementation/internal/course.go
@@ -141,7 +141,7 @@ func (c *Course) Record(evt event.Event) {
 }
 
 // PullEvents returns all the recorded domain events.
-func (c Course) PullEvents() []event.Event {
+func (c *Course) PullEvents() []event.Event {
 	evt := c.events
 	c.events = []event.Event{}
 
diff --git a/07-03-event-bus-implementation/internal/course_test.go b/07-03-event-bus-implementation/internal/course_test.go
new file mode 100644
index 0000000..729065d
--- /dev/null
+++ b/07-03-event-bus-implementation/internal/course_test.go
@@ -0,0 +1,16 @@
+package mooc
+
+import (
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"testing"
+)
+
+func TestCourse_PullEvents(t *testing.T) {
+	courseID, courseName, courseDuration := "37a0f027-15e6-47cc-a5d2-64183281087e", "Test Course", "10 months"
+	course, err := NewCourse(courseID, courseName, courseDuration)
+	require.NoError(t, err)
+
+	assert.GreaterOrEqual(t, len(course.PullEvents()), 1)
+	assert.Len(t, course.PullEvents(), 0)
+}
diff --git a/08-01-reading-env-variables/internal/course.go b/08-01-reading-env-variables/internal/course.go
index c8d76ef..e1347e8 100644
--- a/08-01-reading-env-variables/internal/course.go
+++ b/08-01-reading-env-variables/internal/course.go
@@ -141,7 +141,7 @@ func (c *Course) Record(evt event.Event) {
 }
 
 // PullEvents returns all the recorded domain events.
-func (c Course) PullEvents() []event.Event {
+func (c *Course) PullEvents() []event.Event {
 	evt := c.events
 	c.events = []event.Event{}
 
diff --git a/08-02-build-and-deploy/internal/course.go b/08-02-build-and-deploy/internal/course.go
index d0840a5..08c5ad2 100644
--- a/08-02-build-and-deploy/internal/course.go
+++ b/08-02-build-and-deploy/internal/course.go
@@ -141,7 +141,7 @@ func (c *Course) Record(evt event.Event) {
 }
 
 // PullEvents returns all the recorded domain events.
-func (c Course) PullEvents() []event.Event {
+func (c *Course) PullEvents() []event.Event {
 	evt := c.events
 	c.events = []event.Event{}
 
diff --git a/08-03-debugging/internal/course.go b/08-03-debugging/internal/course.go
index 0292165..94c0245 100644
--- a/08-03-debugging/internal/course.go
+++ b/08-03-debugging/internal/course.go
@@ -141,7 +141,7 @@ func (c *Course) Record(evt event.Event) {
 }
 
 // PullEvents returns all the recorded domain events.
-func (c Course) PullEvents() []event.Event {
+func (c *Course) PullEvents() []event.Event {
 	evt := c.events
 	c.events = []event.Event{}