diff --git a/index/find_component.go b/index/find_component.go
index e05ae09..83e795f 100644
--- a/index/find_component.go
+++ b/index/find_component.go
@@ -44,7 +44,6 @@ func (index *SpecIndex) FindComponent(componentId string) *Reference {
 		// root search
 		return index.FindComponentInRoot(componentId)
 	}
-	return nil
 }
 
 func FindComponent(root *yaml.Node, componentId, absoluteFilePath string, index *SpecIndex) *Reference {
diff --git a/index/rolodex_file_loader_test.go b/index/rolodex_file_loader_test.go
index 9989731..66fe1e9 100644
--- a/index/rolodex_file_loader_test.go
+++ b/index/rolodex_file_loader_test.go
@@ -4,175 +4,183 @@
 package index
 
 import (
-    "github.com/stretchr/testify/assert"
-    "io"
-    "io/fs"
-    "path/filepath"
-    "testing"
-    "testing/fstest"
-    "time"
+	"github.com/stretchr/testify/assert"
+	"io"
+	"io/fs"
+	"path/filepath"
+	"testing"
+	"testing/fstest"
+	"time"
 )
 
 func TestRolodexLoadsFilesCorrectly_NoErrors(t *testing.T) {
-    t.Parallel()
-    testFS := fstest.MapFS{
-        "spec.yaml":             {Data: []byte("hip"), ModTime: time.Now()},
-        "spock.yaml":            {Data: []byte("hip: : hello:  :\n:hw"), ModTime: time.Now()},
-        "subfolder/spec1.json":  {Data: []byte("hop"), ModTime: time.Now()},
-        "subfolder2/spec2.yaml": {Data: []byte("chop"), ModTime: time.Now()},
-        "subfolder2/hello.jpg":  {Data: []byte("shop"), ModTime: time.Now()},
-    }
+	t.Parallel()
+	testFS := fstest.MapFS{
+		"spec.yaml":             {Data: []byte("hip"), ModTime: time.Now()},
+		"spock.yaml":            {Data: []byte("hip: : hello:  :\n:hw"), ModTime: time.Now()},
+		"subfolder/spec1.json":  {Data: []byte("hop"), ModTime: time.Now()},
+		"subfolder2/spec2.yaml": {Data: []byte("chop"), ModTime: time.Now()},
+		"subfolder2/hello.jpg":  {Data: []byte("shop"), ModTime: time.Now()},
+	}
 
-    fileFS, err := NewLocalFS(".", testFS)
-    if err != nil {
-        t.Fatal(err)
-    }
+	fileFS, err := NewLocalFS(".", testFS)
+	if err != nil {
+		t.Fatal(err)
+	}
 
-    files := fileFS.GetFiles()
-    assert.Len(t, files, 4)
-    assert.Len(t, fileFS.GetErrors(), 0)
+	files := fileFS.GetFiles()
+	assert.Len(t, files, 4)
+	assert.Len(t, fileFS.GetErrors(), 0)
 
-    key, _ := filepath.Abs(filepath.Join(fileFS.baseDirectory, "spec.yaml"))
+	key, _ := filepath.Abs(filepath.Join(fileFS.baseDirectory, "spec.yaml"))
 
-    localFile := files[key]
-    assert.NotNil(t, localFile)
-    assert.Nil(t, localFile.GetIndex())
+	localFile := files[key]
+	assert.NotNil(t, localFile)
+	assert.Nil(t, localFile.GetIndex())
 
-    lf := localFile.(*LocalFile)
-    idx, ierr := lf.Index(CreateOpenAPIIndexConfig())
-    assert.NoError(t, ierr)
-    assert.NotNil(t, idx)
-    assert.NotNil(t, localFile.GetContent())
+	lf := localFile.(*LocalFile)
+	idx, ierr := lf.Index(CreateOpenAPIIndexConfig())
+	assert.NoError(t, ierr)
+	assert.NotNil(t, idx)
+	assert.NotNil(t, localFile.GetContent())
 
-    d, e := localFile.GetContentAsYAMLNode()
-    assert.NoError(t, e)
-    assert.NotNil(t, d)
-    assert.NotNil(t, localFile.GetIndex())
-    assert.Equal(t, YAML, localFile.GetFileExtension())
-    assert.Equal(t, key, localFile.GetFullPath())
-    assert.Equal(t, "spec.yaml", lf.Name())
-    assert.Equal(t, int64(3), lf.Size())
-    assert.Equal(t, fs.FileMode(0), lf.Mode())
-    assert.False(t, lf.IsDir())
-    assert.Equal(t, time.Now().Unix(), lf.ModTime().Unix())
-    assert.Nil(t, lf.Sys())
-    assert.Nil(t, lf.Close())
-    q, w := lf.Stat()
-    assert.NotNil(t, q)
-    assert.NoError(t, w)
+	d, e := localFile.GetContentAsYAMLNode()
+	assert.NoError(t, e)
+	assert.NotNil(t, d)
+	assert.NotNil(t, localFile.GetIndex())
+	assert.Equal(t, YAML, localFile.GetFileExtension())
+	assert.Equal(t, key, localFile.GetFullPath())
+	assert.Equal(t, "spec.yaml", lf.Name())
+	assert.Equal(t, int64(3), lf.Size())
+	assert.Equal(t, fs.FileMode(0), lf.Mode())
+	assert.False(t, lf.IsDir())
+	assert.Equal(t, time.Now().Unix(), lf.ModTime().Unix())
+	assert.Nil(t, lf.Sys())
+	assert.Nil(t, lf.Close())
+	q, w := lf.Stat()
+	assert.NotNil(t, q)
+	assert.NoError(t, w)
 
-    b, x := io.ReadAll(lf)
-    assert.Len(t, b, 3)
-    assert.NoError(t, x)
+	b, x := io.ReadAll(lf)
+	assert.Len(t, b, 3)
+	assert.NoError(t, x)
 
-    assert.Equal(t, key, lf.FullPath())
-    assert.Len(t, localFile.GetErrors(), 0)
+	assert.Equal(t, key, lf.FullPath())
+	assert.Len(t, localFile.GetErrors(), 0)
 
-    // try and reindex
-    idx, ierr = lf.Index(CreateOpenAPIIndexConfig())
-    assert.NoError(t, ierr)
-    assert.NotNil(t, idx)
+	// try and reindex
+	idx, ierr = lf.Index(CreateOpenAPIIndexConfig())
+	assert.NoError(t, ierr)
+	assert.NotNil(t, idx)
 
-    key, _ = filepath.Abs(filepath.Join(fileFS.baseDirectory, "spock.yaml"))
+	key, _ = filepath.Abs(filepath.Join(fileFS.baseDirectory, "spock.yaml"))
 
-    localFile = files[key]
-    assert.NotNil(t, localFile)
-    assert.Nil(t, localFile.GetIndex())
+	localFile = files[key]
+	assert.NotNil(t, localFile)
+	assert.Nil(t, localFile.GetIndex())
 
-    lf = localFile.(*LocalFile)
-    idx, ierr = lf.Index(CreateOpenAPIIndexConfig())
-    assert.Error(t, ierr)
-    assert.Nil(t, idx)
-    assert.NotNil(t, localFile.GetContent())
-    assert.Nil(t, localFile.GetIndex())
+	lf = localFile.(*LocalFile)
+	idx, ierr = lf.Index(CreateOpenAPIIndexConfig())
+	assert.Error(t, ierr)
+	assert.Nil(t, idx)
+	assert.NotNil(t, localFile.GetContent())
+	assert.Nil(t, localFile.GetIndex())
 
 }
 
 func TestRolodexLocalFS_NoConfig(t *testing.T) {
 
-    lfs := &LocalFS{}
-    f, e := lfs.Open("test.yaml")
-    assert.Nil(t, f)
-    assert.Error(t, e)
+	lfs := &LocalFS{}
+	f, e := lfs.Open("test.yaml")
+	assert.Nil(t, f)
+	assert.Error(t, e)
 }
 
 func TestRolodexLocalFS_NoLookup(t *testing.T) {
 
-    cf := CreateClosedAPIIndexConfig()
-    lfs := &LocalFS{indexConfig: cf}
-    f, e := lfs.Open("test.yaml")
-    assert.Nil(t, f)
-    assert.Error(t, e)
+	cf := CreateClosedAPIIndexConfig()
+	lfs := &LocalFS{indexConfig: cf}
+	f, e := lfs.Open("test.yaml")
+	assert.Nil(t, f)
+	assert.Error(t, e)
 }
 
 func TestRolodexLocalFS_BadAbsFile(t *testing.T) {
 
-    cf := CreateOpenAPIIndexConfig()
-    lfs := &LocalFS{indexConfig: cf}
-    f, e := lfs.Open("/test.yaml")
-    assert.Nil(t, f)
-    assert.Error(t, e)
+	cf := CreateOpenAPIIndexConfig()
+	lfs := &LocalFS{indexConfig: cf}
+	f, e := lfs.Open("/test.yaml")
+	assert.Nil(t, f)
+	assert.Error(t, e)
 }
 
 func TestRolodexLocalFile_BadParse(t *testing.T) {
 
-    lf := &LocalFile{}
-    n, e := lf.GetContentAsYAMLNode()
-    assert.Nil(t, n)
-    assert.Error(t, e)
-    assert.Equal(t, "no data to parse for file: ", e.Error())
+	lf := &LocalFile{}
+	n, e := lf.GetContentAsYAMLNode()
+	assert.Nil(t, n)
+	assert.Error(t, e)
+	assert.Equal(t, "no data to parse for file: ", e.Error())
 }
 
 func TestRolodexLocalFile_NoIndexRoot(t *testing.T) {
 
-    lf := &LocalFile{data: []byte("burders"), index: &SpecIndex{}}
-    n, e := lf.GetContentAsYAMLNode()
-    assert.NotNil(t, n)
-    assert.NoError(t, e)
+	lf := &LocalFile{data: []byte("burders"), index: &SpecIndex{}}
+	n, e := lf.GetContentAsYAMLNode()
+	assert.NotNil(t, n)
+	assert.NoError(t, e)
 
 }
 
 func TestRolodexLocalFile_IndexSingleFile(t *testing.T) {
 
-    testFS := fstest.MapFS{
-        "spec.yaml":  {Data: []byte("hip"), ModTime: time.Now()},
-        "spock.yaml": {Data: []byte("hop"), ModTime: time.Now()},
-        "i-am-a-dir": {Mode: fs.FileMode(fs.ModeDir), ModTime: time.Now()},
-    }
+	testFS := fstest.MapFS{
+		"spec.yaml":  {Data: []byte("hip"), ModTime: time.Now()},
+		"spock.yaml": {Data: []byte("hop"), ModTime: time.Now()},
+		"i-am-a-dir": {Mode: fs.FileMode(fs.ModeDir), ModTime: time.Now()},
+	}
 
-    fileFS, _ := NewLocalFS("spec.yaml", testFS)
-    files := fileFS.GetFiles()
-    assert.Len(t, files, 1)
+	fileFS, _ := NewLocalFS("spec.yaml", testFS)
+	files := fileFS.GetFiles()
+	assert.Len(t, files, 1)
 
 }
 
 func TestRolodexLocalFile_TestFilters(t *testing.T) {
 
-    testFS := fstest.MapFS{
-        "spec.yaml":  {Data: []byte("hip"), ModTime: time.Now()},
-        "spock.yaml": {Data: []byte("pip"), ModTime: time.Now()},
-        "jam.jpg":    {Data: []byte("sip"), ModTime: time.Now()},
-    }
+	testFS := fstest.MapFS{
+		"spec.yaml":  {Data: []byte("hip"), ModTime: time.Now()},
+		"spock.yaml": {Data: []byte("pip"), ModTime: time.Now()},
+		"jam.jpg":    {Data: []byte("sip"), ModTime: time.Now()},
+	}
 
-    fileFS, _ := NewLocalFSWithConfig(&LocalFSConfig{
-        BaseDirectory: ".",
-        FileFilters:   []string{"spec.yaml", "spock.yaml", "jam.jpg"},
-        DirFS:         testFS,
-    })
-    files := fileFS.GetFiles()
-    assert.Len(t, files, 2)
+	fileFS, _ := NewLocalFSWithConfig(&LocalFSConfig{
+		BaseDirectory: ".",
+		FileFilters:   []string{"spec.yaml", "spock.yaml", "jam.jpg"},
+		DirFS:         testFS,
+	})
+	files := fileFS.GetFiles()
+	assert.Len(t, files, 2)
 
 }
 
-func TestRolodexLocalFile_TestBasFS(t *testing.T) {
+func TestRolodexLocalFile_TestBadFS(t *testing.T) {
 
-    testFS := test_badfs{}
+	testFS := test_badfs{}
 
-    fileFS, err := NewLocalFSWithConfig(&LocalFSConfig{
-        BaseDirectory: ".",
-        DirFS:         &testFS,
-    })
-    assert.Error(t, err)
-    assert.Nil(t, fileFS)
+	fileFS, err := NewLocalFSWithConfig(&LocalFSConfig{
+		BaseDirectory: ".",
+		DirFS:         &testFS,
+	})
+	assert.Error(t, err)
+	assert.Nil(t, fileFS)
 
 }
+
+func TestNewRolodexLocalFile_BadOffset(t *testing.T) {
+
+	lf := &LocalFile{offset: -1}
+	z, y := io.ReadAll(lf)
+	assert.Len(t, z, 0)
+	assert.Error(t, y)
+}
diff --git a/index/search_index_test.go b/index/search_index_test.go
index 4fc6c5e..442d9d6 100644
--- a/index/search_index_test.go
+++ b/index/search_index_test.go
@@ -4,6 +4,7 @@
 package index
 
 import (
+	"context"
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v3"
 	"os"
@@ -21,3 +22,15 @@ func TestSpecIndex_SearchIndexForReference(t *testing.T) {
 	ref, _ := idx.SearchIndexForReference("#/components/schemas/Pet")
 	assert.NotNil(t, ref)
 }
+
+func TestSpecIndex_SearchIndexForReferenceWithContext(t *testing.T) {
+	petstore, _ := os.ReadFile("../test_specs/petstorev3.json")
+	var rootNode yaml.Node
+	_ = yaml.Unmarshal(petstore, &rootNode)
+
+	c := CreateOpenAPIIndexConfig()
+	idx := NewSpecIndexWithConfig(&rootNode, c)
+
+	ref, _, _ := idx.SearchIndexForReferenceWithContext(context.Background(), "#/components/schemas/Pet")
+	assert.NotNil(t, ref)
+}