diff --git a/package.json b/package.json
index beadddbba..fae6a5842 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "e2e": "ng e2e",
     "nice": "node server.js",
     "test": "jest  --detectOpenHandles  --runInBand",
+    "test:prof": "ionic build --prod && npm run test",
     "dev": "lite-server --baseDir=www"
   },
   "private": true,
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts
index 93bfa0e5c..f467fe0c9 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -99,7 +99,6 @@ export class NewEventPage implements OnInit {
   Form: FormGroup;
   validateFrom = false
 
-
   public options = [
     { value: true, label: 'True' },
     { value: false, label: 'False' }
@@ -110,14 +109,10 @@ export class NewEventPage implements OnInit {
   public stepMinutes = [1, 5, 10, 15, 20, 25];
   public stepSeconds = [1, 5, 10, 15, 20, 25];
 
-  public dateControlStart = new FormControl(moment("DD MM YYYY hh"));
-  public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
   public dateControlOccurrence = new FormControl(moment("DD MM YYYY hh"));
 
   showLoader = false
 
-
-
   get dateOccurrence () {
     return this.dateControlOccurrence.value
   }
@@ -133,6 +128,7 @@ export class NewEventPage implements OnInit {
   ) {
     this.dateAdapter.setLocale('pt');
     this.loggeduser = userService.ValidatedUser;
+    this.postEvent = new Event();
 
     this.postEvent.StartDate = new Date();
     this.postEvent.EndDate = new Date(new Date().getTime() + 15 * 60000);
@@ -144,7 +140,7 @@ export class NewEventPage implements OnInit {
     if(!this.restoreTemporaryData()){
       // clear
 
-      this.postEvent = new Event();
+      
       this.eventBody = { BodyType : "1", Text : ""};
       this.postEvent.Body = this.eventBody;
 
diff --git a/test/Agenda.spec.ts b/test/Agenda.spec.ts
index fbc721d1e..e5f8a6d25 100644
--- a/test/Agenda.spec.ts
+++ b/test/Agenda.spec.ts
@@ -8,7 +8,7 @@ describe('Puppeteer tests', () => {
         // await page.goto(process.env.PUPPETEER_HOST)
     })
 
-    test('[table] create event', async () => {
+    test('[table] Open create event component', async () => {
 
         await page.setViewport({width: 1200, height: 720});
         await page.goto(process.env.PUPPETEER_HOST); // wait until page load
diff --git a/test/login.spec.ts b/test/login.spec.ts
index c786b33af..fbf520bf7 100644
--- a/test/login.spec.ts
+++ b/test/login.spec.ts
@@ -48,62 +48,62 @@ export const loginTest = async (page) => {
 
 describe('Puppeteer tests', () => {
 
-    beforeAll(async () => {
-        // await page.goto(process.env.PUPPETEER_HOST)
+	beforeAll(async () => {
+		// await page.goto(process.env.PUPPETEER_HOST)
 
-    })
+	})
 
 
 
-    test('[table] Clear Code  button and set pin', async () => {
+	test('[table] Clear Code  button and set pin', async () => {
 
-        const pathname = await page.evaluate( () => window.location.pathname)
-        if (pathname == '/') {
-                
-            // const browser = await puppeteer.launch({headless: false});
-            await page.setViewport({width: 1200, height: 720});
-            await page.goto(process.env.PUPPETEER_HOST); // wait until page load
-            await page.waitForSelector('.btn-ok')
+		const pathname = await page.evaluate( () => window.location.pathname)
+		if (pathname == '/') {
+						
+			// const browser = await puppeteer.launch({headless: false});
+			await page.setViewport({width: 1200, height: 720});
+			await page.goto(process.env.PUPPETEER_HOST); // wait until page load
+			await page.waitForSelector('.btn-ok')
 
 
-            await page.evaluate( () => {
-                let a:  HTMLInputElement = document.querySelector('input[type="text"]')
-                a.value = ''
+			await page.evaluate( () => {
+					let a:  HTMLInputElement = document.querySelector('input[type="text"]')
+					a.value = ''
 
-                let b:  HTMLInputElement = document.querySelector('input[type="password"')
-                b.value = ''
-            })
+					let b:  HTMLInputElement = document.querySelector('input[type="password"')
+					b.value = ''
+			})
 
-            await page.type('input[type="text"]', environment.defaultuser);
-            await page.type('input[type="password"]', environment.defaultuserpwd); 
-            // click and wait for navigation
-            await Promise.all([
-                page.click('.btn-ok'),
-                // page.waitForNavigation({ waitUntil: 'networkidle0' }),
-            ]);
+			await page.type('input[type="text"]', environment.defaultuser);
+			await page.type('input[type="password"]', environment.defaultuserpwd); 
+			// click and wait for navigation
+			await Promise.all([
+					page.click('.btn-ok'),
+					// page.waitForNavigation({ waitUntil: 'networkidle0' }),
+			]);
 
-            await page.waitForSelector('.circle')
-            // define code
-            await page.click('.circle')
-            await page.click('.circle')
-            await page.click('.circle')
+			await page.waitForSelector('.circle')
+			// define code
+			await page.click('.circle')
+			await page.click('.circle')
+			await page.click('.circle')
 
-            // clear code
-            await page.click('.cy-clear')
+			// clear code
+			await page.click('.cy-clear')
 
-            // define code
-            await page.click('.circle')
-            await page.click('.circle')
-            await page.click('.circle')
-            await page.click('.circle')
+			// define code
+			await page.click('.circle')
+			await page.click('.circle')
+			await page.click('.circle')
+			await page.click('.circle')
 
-            await page.waitForSelector('.div-profile')
-            await page.click('.div-profile')
-            
-        }
-    
-        expect(3 + 2).toBe(5);
-    },30000);
+			await page.waitForSelector('.div-profile')
+			await page.click('.div-profile')
+			
+		}
+
+		expect(3 + 2).toBe(5);
+	},30000);