diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.test.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.test.js
index 4b7bc52b44cd28b96e1baf2c3afabe53b8fe4917..bee5e40b6ef73f87ebb35658d79211c29b42b307 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.test.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.test.js
@@ -406,7 +406,7 @@ it("remove default resource and added resource", async () => {
     await act(async () => {
         fireEvent.click(screen.getAllByText("Add Resources")[0].parentElement.parentElement.parentElement.children[3]);
     });
-    await new Promise((r) => setTimeout(r, 1000));
+    
     const addResourceInput = screen.getAllByText("LOFAR Observing Time Commissioning")[0];
     fireEvent.click(addResourceInput);
     // After selecting New Resource
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/__snapshots__/create.test.js.snap b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/__snapshots__/create.test.js.snap
index 04ff8abee575a9ab6c4ee2982f2ce9a65f6ecbd4..984a0022612274e9e04de46032e9986808a8bee8 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/__snapshots__/create.test.js.snap
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/__snapshots__/create.test.js.snap
@@ -3,7 +3,7 @@
 exports[`Scheduling Unit create page default Renders with all standard service mocks 1`] = `
 Array [
   <div
-    className="page-header"
+    className="page-header SchedulingUnit-PageHeader"
   >
     <div
       className="title"
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
index 574440f8e3d79c6d9aa2eb1b8944cb0ae0ace9ce..3e37d2876bdf8cf07be76967514453f995428794 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
@@ -949,7 +949,7 @@ export class SchedulingUnitCreate extends Component {
         return (
             <React.Fragment>
                 <Toast ref={(el) => this.growl = el}/>
-                <PageHeader location={this.props.location} title={'Scheduling Unit - Add'}
+                <PageHeader location={this.props.location} className="SchedulingUnit-PageHeader"  title={'Scheduling Unit - Add'}
                             actions={[{
                                 icon: 'fa-window-close', title: 'Click to close Scheduling Unit creation',
                                 type: 'button', actOn: 'click', props: {callback: this.checkIsDirty}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.test.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.test.js
index c89e313986c5068807c5519e24e94e02d67a02ec..222886a5ed017794ee9bb8244ef4d5aecacd09f0 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.test.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.test.js
@@ -83,12 +83,14 @@ describe('Scheduling Unit create page default', () => {
         cleanup();
     });
 
-    test("Renders with all standard service mocks", () => {
+    test("Renders with all standard service mocks", async () => {
 
         const page = renderer
             .create(<SchedulingUnitCreate location={{ pathname: '/schedulingunit/create' }} />)
             .toJSON();
-        expect(page).toMatchSnapshot();
+
+
+            await waitFor (() => expect(page).toMatchSnapshot()            );
     })