diff --git a/internal/handlers/ussd/menuhandler_test.go b/internal/handlers/ussd/menuhandler_test.go
index 7940704..6105657 100644
--- a/internal/handlers/ussd/menuhandler_test.go
+++ b/internal/handlers/ussd/menuhandler_test.go
@@ -20,7 +20,7 @@ import (
 
 	"git.grassecon.net/urdt/ussd/common"
 	"github.com/alecthomas/assert/v2"
-	"github.com/grassrootseconomics/eth-custodial/pkg/api"
+//	"github.com/grassrootseconomics/eth-custodial/pkg/api"
 	testdataloader "github.com/peteole/testdata-loader"
 	"github.com/stretchr/testify/require"
 
@@ -1048,7 +1048,7 @@ func TestCheckAccountStatus(t *testing.T) {
 	tests := []struct {
 		name           string
 		input          []byte
-		serverResponse *api.OKResponse
+		//serverResponse *api.OKResponse
 		response       *models.TrackStatusResult
 		expectedResult resource.Result
 	}{
@@ -1086,7 +1086,8 @@ func TestCheckAccountStatus(t *testing.T) {
 			// Define expected interactions with the mock
 			mockDataStore.On("ReadEntry", ctx, sessionId, common.DATA_PUBLIC_KEY).Return(tt.input, nil)
 
-			mockCreateAccountService.On("TrackAccountStatus", string(tt.input)).Return(tt.serverResponse, nil)
+			//mockCreateAccountService.On("TrackAccountStatus", string(tt.input)).Return(tt.serverResponse, nil)
+			mockCreateAccountService.On("TrackAccountStatus", string(tt.input)).Return(tt.response, nil)
 			mockDataStore.On("WriteEntry", ctx, sessionId, common.DATA_ACCOUNT_STATUS, status).Return(nil).Maybe()
 
 			// Call the method under test
diff --git a/remote/accountservice.go b/remote/accountservice.go
index 24a469e..bc6a448 100644
--- a/remote/accountservice.go
+++ b/remote/accountservice.go
@@ -36,10 +36,10 @@ type AccountService struct {
 //   - string: The status of the transaction as a string. If there is an error during the request or processing, this will be an empty string.
 //   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
 //     If no error occurs, this will be nil
-func (as *AccountService) TrackAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResult, error) {
+func (as *AccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*models.TrackStatusResult, error) {
 	var r models.TrackStatusResult
 
-	ep, err := url.JoinPath(config.TrackURL, trackingId)
+	ep, err := url.JoinPath(config.TrackURL, publicKey)
 	if err != nil {
 		return nil, err
 	}