diff --git a/generator/templates/resultset.tgo b/generator/templates/resultset.tgo
index 5bb187f..078648b 100644
--- a/generator/templates/resultset.tgo
+++ b/generator/templates/resultset.tgo
@@ -19,6 +19,7 @@ func New{{.ResultSetName}}(rs kallax.ResultSet) *{{.ResultSetName}} {
 func (rs *{{.ResultSetName}}) Next() bool {
 	if !rs.ResultSet.Next() {
 		rs.lastErr = rs.ResultSet.Close()
+		rs.last = nil
 		return false
 	}
 
diff --git a/tests/common_test.go b/tests/common_test.go
index e29724b..ff20dff 100644
--- a/tests/common_test.go
+++ b/tests/common_test.go
@@ -95,10 +95,7 @@ func (s *BaseTestSuite) resultOrError(res interface{}, err error) bool {
 	}
 
 	if err == nil && res == nil {
-		s.Fail(
-			`FindOne should return an error or a document, but nothing was returned
-			TODO: https://github.com/src-d/go-kallax/issues/49`,
-		)
+		s.Fail("FindOne should return an error or a document, but nothing was returned")
 		return false
 	}
 
diff --git a/tests/kallax.go b/tests/kallax.go
index 048f0bc..475e871 100644
--- a/tests/kallax.go
+++ b/tests/kallax.go
@@ -356,6 +356,7 @@ func NewCarResultSet(rs kallax.ResultSet) *CarResultSet {
 func (rs *CarResultSet) Next() bool {
 	if !rs.ResultSet.Next() {
 		rs.lastErr = rs.ResultSet.Close()
+		rs.last = nil
 		return false
 	}
 
@@ -735,6 +736,7 @@ func NewEventsFixtureResultSet(rs kallax.ResultSet) *EventsFixtureResultSet {
 func (rs *EventsFixtureResultSet) Next() bool {
 	if !rs.ResultSet.Next() {
 		rs.lastErr = rs.ResultSet.Close()
+		rs.last = nil
 		return false
 	}
 
@@ -1106,6 +1108,7 @@ func NewEventsSaveFixtureResultSet(rs kallax.ResultSet) *EventsSaveFixtureResult
 func (rs *EventsSaveFixtureResultSet) Next() bool {
 	if !rs.ResultSet.Next() {
 		rs.lastErr = rs.ResultSet.Close()
+		rs.last = nil
 		return false
 	}
 
@@ -1465,6 +1468,7 @@ func NewMultiKeySortFixtureResultSet(rs kallax.ResultSet) *MultiKeySortFixtureRe
 func (rs *MultiKeySortFixtureResultSet) Next() bool {
 	if !rs.ResultSet.Next() {
 		rs.lastErr = rs.ResultSet.Close()
+		rs.last = nil
 		return false
 	}
 
@@ -1987,6 +1991,7 @@ func NewPersonResultSet(rs kallax.ResultSet) *PersonResultSet {
 func (rs *PersonResultSet) Next() bool {
 	if !rs.ResultSet.Next() {
 		rs.lastErr = rs.ResultSet.Close()
+		rs.last = nil
 		return false
 	}
 
@@ -2419,6 +2424,7 @@ func NewPetResultSet(rs kallax.ResultSet) *PetResultSet {
 func (rs *PetResultSet) Next() bool {
 	if !rs.ResultSet.Next() {
 		rs.lastErr = rs.ResultSet.Close()
+		rs.last = nil
 		return false
 	}
 
@@ -2770,6 +2776,7 @@ func NewQueryFixtureResultSet(rs kallax.ResultSet) *QueryFixtureResultSet {
 func (rs *QueryFixtureResultSet) Next() bool {
 	if !rs.ResultSet.Next() {
 		rs.lastErr = rs.ResultSet.Close()
+		rs.last = nil
 		return false
 	}
 
@@ -3121,6 +3128,7 @@ func NewResultSetFixtureResultSet(rs kallax.ResultSet) *ResultSetFixtureResultSe
 func (rs *ResultSetFixtureResultSet) Next() bool {
 	if !rs.ResultSet.Next() {
 		rs.lastErr = rs.ResultSet.Close()
+		rs.last = nil
 		return false
 	}
 
@@ -3582,6 +3590,7 @@ func NewSchemaFixtureResultSet(rs kallax.ResultSet) *SchemaFixtureResultSet {
 func (rs *SchemaFixtureResultSet) Next() bool {
 	if !rs.ResultSet.Next() {
 		rs.lastErr = rs.ResultSet.Close()
+		rs.last = nil
 		return false
 	}
 
@@ -3933,6 +3942,7 @@ func NewStoreFixtureResultSet(rs kallax.ResultSet) *StoreFixtureResultSet {
 func (rs *StoreFixtureResultSet) Next() bool {
 	if !rs.ResultSet.Next() {
 		rs.lastErr = rs.ResultSet.Close()
+		rs.last = nil
 		return false
 	}
 
@@ -4284,6 +4294,7 @@ func NewStoreWithConstructFixtureResultSet(rs kallax.ResultSet) *StoreWithConstr
 func (rs *StoreWithConstructFixtureResultSet) Next() bool {
 	if !rs.ResultSet.Next() {
 		rs.lastErr = rs.ResultSet.Close()
+		rs.last = nil
 		return false
 	}
 
@@ -4639,6 +4650,7 @@ func NewStoreWithNewFixtureResultSet(rs kallax.ResultSet) *StoreWithNewFixtureRe
 func (rs *StoreWithNewFixtureResultSet) Next() bool {
 	if !rs.ResultSet.Next() {
 		rs.lastErr = rs.ResultSet.Close()
+		rs.last = nil
 		return false
 	}
 
diff --git a/tests/query_test.go b/tests/query_test.go
index a55908a..8e0f560 100644
--- a/tests/query_test.go
+++ b/tests/query_test.go
@@ -29,9 +29,10 @@ func (s *QuerySuite) TestQuery() {
 
 	query := NewQueryFixtureQuery()
 	query.Where(kallax.Eq(Schema.QueryFixture.ID, doc.ID))
+
 	s.NotPanics(func() {
 		s.Equal("bar", store.MustFindOne(query).Foo)
-	}, "TODO: https://github.com/src-d/go-kallax/issues/49")
+	})
 
 	notID := kallax.NewID()
 	queryErr := NewQueryFixtureQuery()
diff --git a/tests/resultset_test.go b/tests/resultset_test.go
index 9f3465a..35aabe8 100644
--- a/tests/resultset_test.go
+++ b/tests/resultset_test.go
@@ -136,7 +136,6 @@ func (s *ResulsetSuite) TestResultSetForEachError() {
 	})
 }
 
-// TODO: https://github.com/src-d/go-kallax/issues/49
 func (s *ResulsetSuite) TestForEachAndCount() {
 	store := NewResultSetFixtureStore(s.db)
 
@@ -151,7 +150,7 @@ func (s *ResulsetSuite) TestForEachAndCount() {
 	manualCount := 0
 	rs.ForEach(func(doc *ResultSetFixture) error {
 		manualCount++
-		s.NotNil(doc, "TODO: https://github.com/src-d/go-kallax/issues/49")
+		s.NotNil(doc)
 		return nil
 	})
 	s.Equal(2, manualCount)
diff --git a/tests/store_test.go b/tests/store_test.go
index abf4711..ac161ba 100644
--- a/tests/store_test.go
+++ b/tests/store_test.go
@@ -86,7 +86,7 @@ func (s *StoreSuite) TestStoreInsertUpdateMustFind() {
 	s.Nil(err)
 	s.NotPanics(func() {
 		s.Equal("foo", store.MustFindOne(NewStoreWithConstructFixtureQuery()).Foo)
-	}, "TODO: https://github.com/src-d/go-kallax/issues/49")
+	})
 
 	doc.Foo = "bar"
 	updatedRows, err := store.Update(doc)
@@ -94,7 +94,7 @@ func (s *StoreSuite) TestStoreInsertUpdateMustFind() {
 	s.True(updatedRows > 0)
 	s.NotPanics(func() {
 		s.Equal("bar", store.MustFindOne(NewStoreWithConstructFixtureQuery()).Foo)
-	}, "TODO: https://github.com/src-d/go-kallax/issues/49")
+	})
 }
 
 func (s *StoreSuite) TestStoreSave() {
@@ -107,7 +107,7 @@ func (s *StoreSuite) TestStoreSave() {
 	s.True(doc.IsPersisted())
 	s.NotPanics(func() {
 		s.Equal("foo", store.MustFindOne(NewStoreWithConstructFixtureQuery()).Foo)
-	}, "TODO: https://github.com/src-d/go-kallax/issues/49")
+	})
 
 	doc.Foo = "bar"
 	updated, err = store.Save(doc)
@@ -115,7 +115,7 @@ func (s *StoreSuite) TestStoreSave() {
 	s.True(updated)
 	s.NotPanics(func() {
 		s.Equal("bar", store.MustFindOne(NewStoreWithConstructFixtureQuery()).Foo)
-	}, "TODO: https://github.com/src-d/go-kallax/issues/49")
+	})
 }
 
 func (s *StoreSuite) TestMultiKeySort() {
@@ -169,16 +169,13 @@ func (s *StoreSuite) TestMultiKeySort() {
 	s.Len(documents, 4)
 	success := true
 	for _, doc := range documents {
-		if !s.NotNil(doc, "TODO: https://github.com/src-d/go-kallax/issues/49") {
+		if !s.NotNil(doc) {
 			success = false
 		}
 	}
 
 	if !success {
-		s.Fail(
-			`Testcase aborted. All retrieved Documents should be not-nil
-			TODO: https://github.com/src-d/go-kallax/issues/49`,
-		)
+		s.Fail("Testcase aborted. All retrieved Documents should be not-nil")
 		return
 	}
 
@@ -188,7 +185,6 @@ func (s *StoreSuite) TestMultiKeySort() {
 	s.Equal("2001-2012", documents[3].Name)
 }
 
-// TODO: https://github.com/src-d/go-kallax/issues/49
 func (s *StoreSuite) TestFindOne() {
 	store := NewStoreWithConstructFixtureStore(s.db)
 
@@ -198,7 +194,7 @@ func (s *StoreSuite) TestFindOne() {
 	query := NewStoreWithConstructFixtureQuery()
 	docFound, err := store.FindOne(query)
 	s.resultOrError(docFound, err)
-	if s.NotNil(docFound, "TODO: https://github.com/src-d/go-kallax/issues/49") {
+	if s.NotNil(docFound) {
 		s.Equal(docInserted.Foo, docFound.Foo)
 	}
 }