diff --git a/projects/angular-ngrx-material-starter/src/app/features/examples/simple-state-management/user.service.spec.ts b/projects/angular-ngrx-material-starter/src/app/features/examples/simple-state-management/user.service.spec.ts
index aec8e1a0a..a5e5cf33d 100644
--- a/projects/angular-ngrx-material-starter/src/app/features/examples/simple-state-management/user.service.spec.ts
+++ b/projects/angular-ngrx-material-starter/src/app/features/examples/simple-state-management/user.service.spec.ts
@@ -26,11 +26,10 @@ describe('UserService', () => {
 
   it('should add user', done => {
     service.addUser({ username: 'test', name: 'Test', surname: 'Tester' });
-    setTimeout(() => {
-      service.users$.subscribe(users => {
-        expect(users.length).toBe(4);
-        done();
-      });
+    service.users$.subscribe(users => {
+      expect(users.length).toBe(4);
+      expect(users[3].username).toBe('test');
+      done();
     });
   });
 });
diff --git a/projects/angular-ngrx-material-starter/src/app/features/examples/simple-state-management/user.service.ts b/projects/angular-ngrx-material-starter/src/app/features/examples/simple-state-management/user.service.ts
index 1a13a75a3..61463e3c7 100644
--- a/projects/angular-ngrx-material-starter/src/app/features/examples/simple-state-management/user.service.ts
+++ b/projects/angular-ngrx-material-starter/src/app/features/examples/simple-state-management/user.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 import { Model, ModelFactory } from '@angular-extensions/model';
 import { Observable } from 'rxjs';
 
-const initialData: User[] = [
+const INITIAL_DATA: User[] = [
   { id: uuid(), username: 'rockets', name: 'Elon', surname: 'Musk' },
   { id: uuid(), username: 'investing', name: 'Nassim', surname: 'Taleb' },
   { id: uuid(), username: 'philosophy', name: 'Yuval', surname: 'Harari' }
@@ -16,7 +16,7 @@ export class UserService {
   users$: Observable<User[]>;
 
   constructor(private modelFactory: ModelFactory<User[]>) {
-    this.model = this.modelFactory.create(initialData);
+    this.model = this.modelFactory.create([...INITIAL_DATA]);
     this.users$ = this.model.data$;
   }