diff --git a/src/modules/list/commands.go b/src/modules/list/commands.go
index 63c4fe6..d39100b 100644
--- a/src/modules/list/commands.go
+++ b/src/modules/list/commands.go
@@ -63,7 +63,7 @@ func handleLIndex(ctx context.Context, cmd []string, server utils.Server, conn *
 		return nil, errors.New("LINDEX command on non-list item")
 	}
 
-	if !(index >= 0 && int(index) < len(list)) {
+	if !(index >= 0 && index < len(list)) {
 		return nil, errors.New("index must be within list range")
 	}
 
diff --git a/src/modules/list/commands_test.go b/src/modules/list/commands_test.go
index 023d22e..272da74 100644
--- a/src/modules/list/commands_test.go
+++ b/src/modules/list/commands_test.go
@@ -95,7 +95,126 @@ func Test_HandleLLEN(t *testing.T) {
 	}
 }
 
-func Test_HandleLINDEX(t *testing.T) {}
+func Test_HandleLINDEX(t *testing.T) {
+	mockServer := server.NewServer(server.Opts{})
+
+	tests := []struct {
+		preset           bool
+		key              string
+		presetValue      interface{}
+		command          []string
+		expectedResponse interface{}
+		expectedValue    []interface{}
+		expectedError    error
+	}{
+		{ // Return last element within range
+			preset:           true,
+			key:              "key1",
+			presetValue:      []interface{}{"value1", "value2", "value3", "value4"},
+			command:          []string{"LINDEX", "key1", "3"},
+			expectedResponse: "value4",
+			expectedValue:    nil,
+			expectedError:    nil,
+		},
+		{ // Return first element within range
+			preset:           true,
+			key:              "key2",
+			presetValue:      []interface{}{"value1", "value2", "value3", "value4"},
+			command:          []string{"LINDEX", "key1", "0"},
+			expectedResponse: "value1",
+			expectedValue:    nil,
+			expectedError:    nil,
+		},
+		{ // Return middle element within range
+			preset:           true,
+			key:              "key3",
+			presetValue:      []interface{}{"value1", "value2", "value3", "value4"},
+			command:          []string{"LINDEX", "key1", "1"},
+			expectedResponse: "value2",
+			expectedValue:    nil,
+			expectedError:    nil,
+		},
+		{ // If key does not exist, return error
+			preset:           false,
+			key:              "key4",
+			presetValue:      nil,
+			command:          []string{"LLEN", "key4", "0"},
+			expectedResponse: 0,
+			expectedValue:    nil,
+			expectedError:    errors.New("LINDEX command on non-list item"),
+		},
+		{ // Command too short
+			preset:           false,
+			key:              "key3",
+			presetValue:      nil,
+			command:          []string{"LINDEX", "key3"},
+			expectedResponse: 0,
+			expectedValue:    nil,
+			expectedError:    errors.New(utils.WRONG_ARGS_RESPONSE),
+		},
+		{ // Command too long
+			preset:           false,
+			key:              "key4",
+			presetValue:      nil,
+			command:          []string{"LINDEX", "key4", "0", "20"},
+			expectedResponse: 0,
+			expectedValue:    nil,
+			expectedError:    errors.New(utils.WRONG_ARGS_RESPONSE),
+		},
+		{ // Trying to get element by index on a non-list returns error
+			preset:           true,
+			key:              "key5",
+			presetValue:      "Default value",
+			command:          []string{"LINDEX", "key5", "0"},
+			expectedResponse: 0,
+			expectedValue:    nil,
+			expectedError:    errors.New("LINDEX command on non-list item"),
+		},
+		{ // Trying to get index out of range index beyond last index
+			preset:           true,
+			key:              "key6",
+			presetValue:      []interface{}{"value1", "value2", "value3"},
+			command:          []string{"LINDEX", "key6", "3"},
+			expectedResponse: 0,
+			expectedValue:    nil,
+			expectedError:    errors.New("index must be within list range"),
+		},
+		{ // Trying to get index out of range with negative index
+			preset:           true,
+			key:              "key7",
+			presetValue:      []interface{}{"value1", "value2", "value3"},
+			command:          []string{"LINDEX", "key6", "-1"},
+			expectedResponse: 0,
+			expectedValue:    nil,
+			expectedError:    errors.New("index must be within list range"),
+		},
+	}
+
+	for _, test := range tests {
+		if test.preset {
+			if _, err := mockServer.CreateKeyAndLock(context.Background(), test.key); err != nil {
+				t.Error(err)
+			}
+			mockServer.SetValue(context.Background(), test.key, test.presetValue)
+			mockServer.KeyUnlock(test.key)
+		}
+		res, err := handleLIndex(context.Background(), test.command, mockServer, nil)
+		if test.expectedError != nil {
+			if err.Error() != test.expectedError.Error() {
+				t.Errorf("expected error \"%s\", got \"%s\"", test.expectedError.Error(), err.Error())
+			}
+			continue
+		}
+		rd := resp.NewReader(bytes.NewBuffer(res))
+		rv, _, err := rd.ReadValue()
+		if err != nil {
+			t.Error(err)
+		}
+		if rv.String() != test.expectedResponse {
+			t.Errorf("expected response \"%s\", got \"%s\"", test.expectedResponse, rv.String())
+		}
+	}
+}
 
 func Test_HandleLRANGE(t *testing.T) {}
 
diff --git a/src/utils/utils.go b/src/utils/utils.go
index d4c19d4..d005354 100644
--- a/src/utils/utils.go
+++ b/src/utils/utils.go
@@ -3,6 +3,7 @@ package utils
 import (
 	"bytes"
 	"io"
+	"log"
 	"math/big"
 	"net"
 	"slices"
@@ -109,7 +110,11 @@ func GetIPAddress() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	defer conn.Close()
+	defer func() {
+		if err = conn.Close(); err != nil {
+			log.Println(err)
+		}
+	}()
 
 	localAddr := strings.Split(conn.LocalAddr().String(), ":")[0]