diff --git a/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.html b/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.html
index 4a31463a383..d6373717dee 100644
--- a/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.html
+++ b/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.html
@@ -2,11 +2,9 @@
 <br />
 <edit-component-submit-button [componentContent]="component.content">
 </edit-component-submit-button>
-<edit-component-max-submit
-  *ngIf="component.content.showSubmitButton"
-  [componentContent]="component.content"
->
-</edit-component-max-submit>
+@if (component.content.showSubmitButton) {
+  <edit-component-max-submit [componentContent]="component.content" />
+}
 <edit-component-default-feedback [componentContent]="component.content">
 </edit-component-default-feedback>
 <div fxLayout="column" fxLayoutAlign="start start">
diff --git a/src/app/authoring-tool/edit-component-field.component.ts b/src/app/authoring-tool/edit-component-field.component.ts
index 28f1a5e7ba4..b50957ba64a 100644
--- a/src/app/authoring-tool/edit-component-field.component.ts
+++ b/src/app/authoring-tool/edit-component-field.component.ts
@@ -6,12 +6,12 @@ import { TeacherProjectService } from '../../assets/wise5/services/teacherProjec
 @Directive()
 export abstract class EditComponentFieldComponent {
   @Input() componentContent: any;
-  inputChanged: Subject<any> = new Subject<any>();
-  inputChangedSubscription: Subscription;
+  protected inputChanged: Subject<any> = new Subject<any>();
+  protected inputChangedSubscription: Subscription;
 
   constructor(private ProjectService: TeacherProjectService) {}
 
-  ngOnInit() {
+  ngOnInit(): void {
     this.inputChangedSubscription = this.inputChanged
       .pipe(debounceTime(1000), distinctUntilChanged())
       .subscribe(() => {
@@ -19,7 +19,7 @@ export abstract class EditComponentFieldComponent {
       });
   }
 
-  ngOnDestroy() {
+  ngOnDestroy(): void {
     this.inputChangedSubscription.unsubscribe();
   }
 }
diff --git a/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.spec.ts b/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.spec.ts
index 5c2b276cb4b..84ff856fedf 100644
--- a/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.spec.ts
+++ b/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.spec.ts
@@ -1,10 +1,8 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { EditComponentMaxSubmitComponent } from './edit-component-max-submit.component';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TeacherProjectService } from '../../../assets/wise5/services/teacherProjectService';
-import { StudentTeacherCommonServicesModule } from '../../student-teacher-common-services.module';
-import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { MockProvider } from 'ng-mocks';
 
 describe('EditComponentMaxSubmitComponent', () => {
   let component: EditComponentMaxSubmitComponent;
@@ -12,11 +10,9 @@ describe('EditComponentMaxSubmitComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-    declarations: [EditComponentMaxSubmitComponent],
-    schemas: [NO_ERRORS_SCHEMA],
-    imports: [StudentTeacherCommonServicesModule],
-    providers: [TeacherProjectService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
-}).compileComponents();
+      imports: [EditComponentMaxSubmitComponent],
+      providers: [MockProvider(TeacherProjectService), provideHttpClient(withInterceptorsFromDi())]
+    }).compileComponents();
   });
 
   beforeEach(() => {
diff --git a/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.ts b/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.ts
index 49d3e849ba5..b1dbab78628 100644
--- a/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.ts
+++ b/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.ts
@@ -1,10 +1,13 @@
 import { Component } from '@angular/core';
 import { EditComponentFieldComponent } from '../edit-component-field.component';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { FormsModule } from '@angular/forms';
+import { MatInputModule } from '@angular/material/input';
 
 @Component({
-    selector: 'edit-component-max-submit',
-    templateUrl: './edit-component-max-submit.component.html',
-    styleUrls: ['./edit-component-max-submit.component.scss'],
-    standalone: false
+  imports: [FormsModule, MatFormFieldModule, MatInputModule],
+  selector: 'edit-component-max-submit',
+  styleUrl: './edit-component-max-submit.component.scss',
+  templateUrl: './edit-component-max-submit.component.html'
 })
 export class EditComponentMaxSubmitComponent extends EditComponentFieldComponent {}
diff --git a/src/app/teacher/component-authoring.module.ts b/src/app/teacher/component-authoring.module.ts
index b352208d64c..6904ea045db 100644
--- a/src/app/teacher/component-authoring.module.ts
+++ b/src/app/teacher/component-authoring.module.ts
@@ -113,7 +113,6 @@ import { EditCRaterIdeaDescriptionsComponent } from '../../assets/wise5/componen
     EditComponentExcludeFromTotalScoreComponent,
     EditComponentJsonComponent,
     EditComponentMaxScoreComponent,
-    EditComponentMaxSubmitComponent,
     EditComponentPeerGroupingTagComponent,
     EditComponentRubricComponent,
     EditComponentSaveButtonComponent,
@@ -172,6 +171,7 @@ import { EditCRaterIdeaDescriptionsComponent } from '../../assets/wise5/componen
     ComponentAuthoringComponent,
     EditComponentAdvancedButtonComponent,
     EditComponentConstraintsComponent,
+    EditComponentMaxSubmitComponent,
     EditComponentPrompt,
     EditComponentWidthComponent,
     EditCRaterIdeaDescriptionsComponent,
diff --git a/src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html b/src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html
index 18baf357dfd..bc55f8a8134 100644
--- a/src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html
+++ b/src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html
@@ -12,7 +12,7 @@
       type="text"
     />
   </mat-form-field>
-  <edit-component-max-submit [componentContent]="componentContent"></edit-component-max-submit>
+  <edit-component-max-submit [componentContent]="componentContent" />
   <mat-checkbox
     color="primary"
     [(ngModel)]="componentContent.isComputerAvatarEnabled"
diff --git a/src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.spec.ts b/src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.spec.ts
index b81d014d7ee..c49ce664ec3 100644
--- a/src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.spec.ts
+++ b/src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.spec.ts
@@ -1,4 +1,3 @@
-import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { StudentTeacherCommonServicesModule } from '../../../../../app/student-teacher-common-services.module';
@@ -31,11 +30,7 @@ describe('DialogGuidanceAuthoringComponent', () => {
         DialogGuidanceAuthoringModule,
         StudentTeacherCommonServicesModule
       ],
-      providers: [
-        TeacherNodeService,
-        provideHttpClient(withInterceptorsFromDi()),
-        provideHttpClientTesting()
-      ]
+      providers: [TeacherNodeService, provideHttpClient(withInterceptorsFromDi())]
     });
     spyOn(TestBed.inject(TeacherProjectService), 'getLocale').and.returnValue(
       new ProjectLocale({ default: 'en-US' })
diff --git a/src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.module.ts b/src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.module.ts
index d6119cc1183..d41ead522a3 100644
--- a/src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.module.ts
+++ b/src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.module.ts
@@ -28,13 +28,13 @@ import { TeacherNodeService } from '../../../services/teacherNodeService';
 @NgModule({
   declarations: [
     DialogGuidanceAuthoringComponent,
-    EditComponentMaxSubmitComponent,
     EditFeedbackRulesComponent,
     FeedbackRuleHelpComponent
   ],
   imports: [
     CommonModule,
     ComponentAuthoringModule,
+    EditComponentMaxSubmitComponent,
     EditComponentPrompt,
     DragDropModule,
     FormsModule,
@@ -57,11 +57,6 @@ import { TeacherNodeService } from '../../../services/teacherNodeService';
     TeacherNodeService,
     TeacherProjectService
   ],
-  exports: [
-    DialogGuidanceAuthoringComponent,
-    EditComponentPrompt,
-    EditComponentMaxSubmitComponent,
-    EditFeedbackRulesComponent
-  ]
+  exports: [DialogGuidanceAuthoringComponent, EditComponentPrompt, EditFeedbackRulesComponent]
 })
 export class DialogGuidanceAuthoringModule {}
diff --git a/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html b/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html
index d53e0b59500..b7144ec8678 100644
--- a/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html
+++ b/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html
@@ -5,11 +5,9 @@
 <edit-component-save-button [componentContent]="componentContent"> </edit-component-save-button>
 <br />
 <edit-component-submit-button [componentContent]="componentContent"> </edit-component-submit-button>
-<edit-component-max-submit
-  *ngIf="componentContent.showSubmitButton"
-  [componentContent]="componentContent"
->
-</edit-component-max-submit>
+@if (componentContent.showSubmitButton) {
+  <edit-component-max-submit [componentContent]="componentContent" />
+}
 <edit-component-default-feedback [componentContent]="componentContent">
 </edit-component-default-feedback>
 <div fxLayout="column" fxLayoutAlign="start start">
diff --git a/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html b/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html
index 31357d5e51d..f326e8bfe3e 100644
--- a/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html
+++ b/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html
@@ -176,11 +176,9 @@
 <edit-component-save-button [componentContent]="componentContent"> </edit-component-save-button>
 <br />
 <edit-component-submit-button [componentContent]="componentContent"> </edit-component-submit-button>
-<edit-component-max-submit
-  *ngIf="componentContent.showSubmitButton"
-  [componentContent]="componentContent"
->
-</edit-component-max-submit>
+@if (componentContent.showSubmitButton) {
+  <edit-component-max-submit [componentContent]="componentContent" />
+}
 <edit-component-default-feedback [componentContent]="componentContent">
 </edit-component-default-feedback>
 <div fxLayout="column" fxLayoutAlign="start start">
diff --git a/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html b/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html
index cedceb60ae0..178111109a0 100644
--- a/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html
+++ b/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html
@@ -5,11 +5,9 @@
 <edit-component-save-button [componentContent]="componentContent"> </edit-component-save-button>
 <br />
 <edit-component-submit-button [componentContent]="componentContent"> </edit-component-submit-button>
-<edit-component-max-submit
-  *ngIf="componentContent.showSubmitButton"
-  [componentContent]="componentContent"
->
-</edit-component-max-submit>
+@if (componentContent.showSubmitButton) {
+  <edit-component-max-submit [componentContent]="componentContent" />
+}
 <edit-component-default-feedback [componentContent]="componentContent">
 </edit-component-default-feedback>
 <div fxLayout="column" fxLayoutAlign="start start">
diff --git a/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html b/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html
index 0425e9d5a9c..1bb7e147644 100644
--- a/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html
+++ b/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html
@@ -23,11 +23,9 @@
 <edit-component-save-button [componentContent]="componentContent"> </edit-component-save-button>
 <br />
 <edit-component-submit-button [componentContent]="componentContent"> </edit-component-submit-button>
-<edit-component-max-submit
-  *ngIf="componentContent.showSubmitButton"
-  [componentContent]="componentContent"
->
-</edit-component-max-submit>
+@if (componentContent.showSubmitButton) {
+  <edit-component-max-submit [componentContent]="componentContent" />
+}
 <edit-component-default-feedback [componentContent]="componentContent">
 </edit-component-default-feedback>
 <div fxLayout="column" fxLayoutAlign="start start">
diff --git a/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html b/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html
index 585ee80f666..7a01101f959 100644
--- a/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html
+++ b/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html
@@ -11,11 +11,9 @@
 <edit-component-save-button [componentContent]="componentContent"> </edit-component-save-button>
 <br />
 <edit-component-submit-button [componentContent]="componentContent"> </edit-component-submit-button>
-<edit-component-max-submit
-  *ngIf="componentContent.showSubmitButton"
-  [componentContent]="componentContent"
->
-</edit-component-max-submit>
+@if (componentContent.showSubmitButton) {
+  <edit-component-max-submit [componentContent]="componentContent" />
+}
 <edit-component-default-feedback [componentContent]="componentContent">
 </edit-component-default-feedback>
 <div fxLayout="column" fxLayoutAlign="start start">
diff --git a/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html b/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html
index ba2e6da0083..af91bae1806 100644
--- a/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html
+++ b/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html
@@ -253,11 +253,9 @@
     Enable Row Selection
   </mat-checkbox>
 </div>
-<edit-component-max-submit
-  *ngIf="componentContent.showSubmitButton"
-  [componentContent]="componentContent"
->
-</edit-component-max-submit>
+@if (componentContent.showSubmitButton) {
+  <edit-component-max-submit [componentContent]="componentContent" />
+}
 <edit-component-default-feedback [componentContent]="componentContent">
 </edit-component-default-feedback>
 <div fxLayout="column" fxLayoutAlign="start start">