diff --git a/src/portal/lib/src/create-edit-endpoint/create-edit-endpoint.component.spec.ts b/src/portal/lib/src/create-edit-endpoint/create-edit-endpoint.component.spec.ts
index ead469cf0..7e280d102 100644
--- a/src/portal/lib/src/create-edit-endpoint/create-edit-endpoint.component.spec.ts
+++ b/src/portal/lib/src/create-edit-endpoint/create-edit-endpoint.component.spec.ts
@@ -77,7 +77,7 @@ describe("CreateEditEndpointComponent (inline template)", () => {
 
     endpointService = fixture.debugElement.injector.get(EndpointService);
     spyAdapter = spyOn(endpointService, "getAdapters").and.returnValue(
-      Promise.resolve(mockAdapter)
+      of(mockAdapter)
     );
 
     spy = spyOn(endpointService, "getEndpoint").and.returnValue(
diff --git a/src/portal/lib/src/create-edit-rule/create-edit-rule.component.spec.ts b/src/portal/lib/src/create-edit-rule/create-edit-rule.component.spec.ts
index 530dfbe13..e25de7eef 100644
--- a/src/portal/lib/src/create-edit-rule/create-edit-rule.component.spec.ts
+++ b/src/portal/lib/src/create-edit-rule/create-edit-rule.component.spec.ts
@@ -53,7 +53,7 @@ describe("CreateEditRuleComponent (inline template)", () => {
       src_namespaces: ["name1", "name2"],
       trigger: {
         kind: "Manual",
-        schedule_param: null
+        schedule_param: {}
       },
       filters: [],
       deletion: false
@@ -154,7 +154,7 @@ describe("CreateEditRuleComponent (inline template)", () => {
     src_registry_id: 10,
     trigger: {
       kind: "Manual",
-      schedule_param: null
+      schedule_param: {}
     },
     filters: [],
     deletion: false
diff --git a/src/portal/lib/src/endpoint/endpoint.component.spec.ts b/src/portal/lib/src/endpoint/endpoint.component.spec.ts
index 72438a8d3..f871efba0 100644
--- a/src/portal/lib/src/endpoint/endpoint.component.spec.ts
+++ b/src/portal/lib/src/endpoint/endpoint.component.spec.ts
@@ -143,7 +143,7 @@ describe("EndpointComponent (inline template)", () => {
     );
 
     spyAdapter = spyOn(endpointService, "getAdapters").and.returnValue(
-      Promise.resolve(mockAdapter)
+      of(mockAdapter)
     );
 
     spyOnRules = spyOn(