diff --git a/ngapp/src/app/activities/activities.component.ts b/ngapp/src/app/activities/activities.component.ts
index aca33f4d..c2643e76 100644
--- a/ngapp/src/app/activities/activities.component.ts
+++ b/ngapp/src/app/activities/activities.component.ts
@@ -35,8 +35,7 @@ import { SortDirection } from "@shared/sort-direction.enum";
   moduleId: module.id,
   selector: "app-activities",
   templateUrl: "./activities.component.html",
-  styleUrls: ["./activities.component.css"],
-  providers: [ ActivityService ]
+  styleUrls: ["./activities.component.css"]
 })
 export class ActivitiesComponent extends AbstractPageComponent {
 
diff --git a/ngapp/src/app/activities/add-activity-wizard/add-activity-wizard.component.ts b/ngapp/src/app/activities/add-activity-wizard/add-activity-wizard.component.ts
index 715d09f0..92363561 100644
--- a/ngapp/src/app/activities/add-activity-wizard/add-activity-wizard.component.ts
+++ b/ngapp/src/app/activities/add-activity-wizard/add-activity-wizard.component.ts
@@ -246,6 +246,7 @@ export class AddActivityWizardComponent implements OnInit {
   public stepChanged($event: WizardEvent): void {
     if ($event.step.config.id === "step1") {
       this.updatePage1ValidStatus();
+      this.wizardConfig.nextTitle = "Next >";
     } else if ($event.step.config.id === "step2a") {
       this.wizardConfig.nextTitle = "Create";
     } else if ($event.step.config.id === "step2b") {
diff --git a/ngapp/src/app/activities/add-activity/add-activity.component.spec.ts b/ngapp/src/app/activities/add-activity/add-activity.component.spec.ts
index f401f4b9..74333747 100644
--- a/ngapp/src/app/activities/add-activity/add-activity.component.spec.ts
+++ b/ngapp/src/app/activities/add-activity/add-activity.component.spec.ts
@@ -1,12 +1,16 @@
 import { async, ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { ReactiveFormsModule } from "@angular/forms";
+import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { RouterTestingModule } from "@angular/router/testing";
 import { AddActivityWizardComponent } from "@activities/add-activity-wizard/add-activity-wizard.component";
 import { CoreModule } from "@core/core.module";
 import { SharedModule } from "@shared/shared.module";
 import { PatternFlyNgModule } from "patternfly-ng";
 import { AddActivityComponent } from "./add-activity.component";
+import { ActivityService } from "@activities/shared/activity.service";
+import { MockActivityService } from "@activities/shared/mock-activity.service";
+import { ConnectionService } from "@connections/shared/connection.service";
+import { MockConnectionService } from "@connections/shared/mock-connection.service";
 
 describe("AddActivityComponent", () => {
   let component: AddActivityComponent;
@@ -14,8 +18,12 @@ describe("AddActivityComponent", () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [ CoreModule, PatternFlyNgModule, ReactiveFormsModule, RouterTestingModule, SharedModule ],
-      declarations: [ AddActivityComponent, AddActivityWizardComponent ]
+      imports: [ CoreModule, PatternFlyNgModule, FormsModule, ReactiveFormsModule, RouterTestingModule, SharedModule ],
+      declarations: [ AddActivityComponent, AddActivityWizardComponent ],
+      providers: [
+        { provide: ActivityService, useClass: MockActivityService },
+        { provide: ConnectionService, useClass: MockConnectionService }
+      ]
     })
       .compileComponents().then(() => {
       // nothing to do
@@ -28,8 +36,7 @@ describe("AddActivityComponent", () => {
     fixture.detectChanges();
   });
 
-  // TODO: Figure out how to setup this test.
-  // it("should be created", () => {
-  //   expect(component).toBeTruthy();
-  // });
+  it("should be created", () => {
+    expect(component).toBeTruthy();
+  });
 });
diff --git a/ngapp/src/app/connections/add-connection/add-connection.component.spec.ts b/ngapp/src/app/connections/add-connection/add-connection.component.spec.ts
index 426ab3a2..10d05c0d 100644
--- a/ngapp/src/app/connections/add-connection/add-connection.component.spec.ts
+++ b/ngapp/src/app/connections/add-connection/add-connection.component.spec.ts
@@ -1,12 +1,14 @@
 import { async, ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { ReactiveFormsModule } from "@angular/forms";
+import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { RouterTestingModule } from "@angular/router/testing";
 import { AddConnectionWizardComponent } from "@connections/add-connection-wizard/add-connection-wizard.component";
 import { CoreModule } from "@core/core.module";
 import { SharedModule } from "@shared/shared.module";
 import { PatternFlyNgModule } from "patternfly-ng";
 import { AddConnectionComponent } from "./add-connection.component";
+import { ConnectionService } from "@connections/shared/connection.service";
+import { MockConnectionService } from "@connections/shared/mock-connection.service";
 
 describe("AddConnectionComponent", () => {
   let component: AddConnectionComponent;
@@ -14,8 +16,11 @@ describe("AddConnectionComponent", () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [ CoreModule, PatternFlyNgModule, ReactiveFormsModule, RouterTestingModule, SharedModule ],
-      declarations: [ AddConnectionComponent, AddConnectionWizardComponent ]
+      imports: [ CoreModule, PatternFlyNgModule, FormsModule, ReactiveFormsModule, RouterTestingModule, SharedModule ],
+      declarations: [ AddConnectionComponent, AddConnectionWizardComponent ],
+      providers: [
+        { provide: ConnectionService, useClass: MockConnectionService },
+      ]
     })
     .compileComponents().then(() => {
       // nothing to do
@@ -28,8 +33,7 @@ describe("AddConnectionComponent", () => {
     fixture.detectChanges();
   });
 
-  // TODO: Figure out how to setup this test.
-  // it("should be created", () => {
-  //   expect(component).toBeTruthy();
-  // });
+  it("should be created", () => {
+    expect(component).toBeTruthy();
+  });
 });
diff --git a/ngapp/src/app/connections/connections-list/connections-list.component.html b/ngapp/src/app/connections/connections-list/connections-list.component.html
index da8c3ca3..97fc8e3d 100644
--- a/ngapp/src/app/connections/connections-list/connections-list.component.html
+++ b/ngapp/src/app/connections/connections-list/connections-list.component.html
@@ -29,8 +29,6 @@
         </div>
       </div>
       <div class="list-view-pf-actions">
-        <button class="btn btn-default" type="button" (click)="onPingConnection(connection.getId())">Ping</button>
-        <button class="btn btn-danger" type="button" (click)="onDeleteConnection(connection.getId())">Delete</button>
         <button i18n="@@connectionsList.ping" class="btn btn-default" type="button" (click)="onPingConnection(connection.getId())">Ping</button>
         <button i18n="@@connectionsList.delete" class="btn btn-danger" type="button" (click)="onDeleteConnection(connection.getId())">Delete</button>
       </div>
diff --git a/ngapp/src/app/connections/connections.component.ts b/ngapp/src/app/connections/connections.component.ts
index 33ef5692..698e21fe 100644
--- a/ngapp/src/app/connections/connections.component.ts
+++ b/ngapp/src/app/connections/connections.component.ts
@@ -33,8 +33,7 @@ import { SortDirection } from "@shared/sort-direction.enum";
   moduleId: module.id,
   selector: "app-connections",
   templateUrl: "./connections.component.html",
-  styleUrls: ["./connections.component.css"],
-  providers: [ConnectionService]
+  styleUrls: ["./connections.component.css"]
 })
 export class ConnectionsComponent extends AbstractPageComponent {