diff --git a/README.md b/README.md
index 028b669..386af17 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,9 @@ The following parameters can be set in config files or in env variables:
 - KAFKA_CLIENT_CERT_KEY: Kafka connection private key, optional; default value is undefined;
     if not provided, then SSL connection is not used, direct insecure connection is used;
     if provided, it can be either path to private key file or private key content
-- CREATE_DATA_TOPIC: create data Kafka topic, default value is 'project.notification.create'
-- UPDATE_DATA_TOPIC: update data Kafka topic, default value is 'project.notification.update'
-- DELETE_DATA_TOPIC: delete data Kafka topic, default value is 'project.notification.delete'
+- CREATE_DATA_TOPIC: create data Kafka topic, default value is 'project.action.create'
+- UPDATE_DATA_TOPIC: update data Kafka topic, default value is 'project.action.update'
+- DELETE_DATA_TOPIC: delete data Kafka topic, default value is 'project.action.delete'
 - KAFKA_MESSAGE_ORIGINATOR: Kafka topic originator, default value is 'project-api'
 - esConfig: config object for Elasticsearch
 
@@ -41,27 +41,27 @@ Config for tests are at `config/test.js`, it overrides some default config.
 - Download kafka at `https://www.apache.org/dyn/closer.cgi?path=/kafka/1.1.0/kafka_2.11-1.1.0.tgz`
 - Extract out the doanlowded tgz file
 - Go to extracted directory kafka_2.11-0.11.0.1
-- Start ZooKeeper server:  
+- Start ZooKeeper server:
   `bin/zookeeper-server-start.sh config/zookeeper.properties`
-- Use another terminal, go to same directory, start the Kafka server:  
+- Use another terminal, go to same directory, start the Kafka server:
   `bin/kafka-server-start.sh config/server.properties`
 - Note that the zookeeper server is at localhost:2181, and Kafka server is at localhost:9092
-- Use another terminal, go to same directory, create some topics:  
-  `bin/kafka-topics.sh --create --zookeeper localhost:2181 --replication-factor 1 --partitions 1 --topic project.notification.create`  
-  `bin/kafka-topics.sh --create --zookeeper localhost:2181 --replication-factor 1 --partitions 1 --topic project.notification.update`  
-  `bin/kafka-topics.sh --create --zookeeper localhost:2181 --replication-factor 1 --partitions 1 --topic project.notification.delete`  
-- Verify that the topics are created:  
+- Use another terminal, go to same directory, create some topics:
+  `bin/kafka-topics.sh --create --zookeeper localhost:2181 --replication-factor 1 --partitions 1 --topic project.action.create`
+  `bin/kafka-topics.sh --create --zookeeper localhost:2181 --replication-factor 1 --partitions 1 --topic project.action.update`
+  `bin/kafka-topics.sh --create --zookeeper localhost:2181 --replication-factor 1 --partitions 1 --topic project.action.delete`
+- Verify that the topics are created:
   `bin/kafka-topics.sh --list --zookeeper localhost:2181`,
   it should list out the created topics
-- run the producer and then write some message into the console to send to the `project.notification.create` topic:  
-  `bin/kafka-console-producer.sh --broker-list localhost:9092 --topic project.notification.create`  
-  in the console, write message, one message per line:  
-  `{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-20T13:43:25.817Z","mime-type":"application/json","payload":{"resource":"project","createdAt":"2019-06-20T13:43:23.554Z","updatedAt":"2019-06-20T13:43:23.555Z","terms":[],"id":1,"name":"test project","description":"Hello I am a test project","type":"app","createdBy":40051333,"updatedBy":40051333,"projectEligibility":[],"bookmarks":[],"external":null,"status":"draft","lastActivityAt":"2019-06-20T13:43:23.514Z","lastActivityUserId":"40051333","members":[{"createdAt":"2019-06-20T13:43:23.555Z","updatedAt":"2019-06-20T13:43:23.625Z","id":2,"isPrimary":true,"role":"manager","userId":40051333,"updatedBy":40051333,"createdBy":40051333,"projectId":2,"deletedAt":null,"deletedBy":null}],"version":"v2","directProjectId":null,"billingAccountId":null,"estimatedPrice":null,"actualPrice":null,"details":null,"cancelReason":null,"templateId":null,"deletedBy":null,"attachments":null,"phases":null,"projectUrl":"https://connect.topcoder-dev.com/projects/2"}}`
-- Optionally, use another terminal, go to same directory, start a consumer to view the messages:  
-  `bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic project.notification.create --from-beginning`
-- If the kafka don't allow to input long message you can use this script to write message from file:  
-  `path_to_kafka/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic project.notification.create < our_project_root_directory/test/data/project/project.notification.create.json`
-- Writing/reading messages to/from other topics are similar. All example for messages are in:  
+- run the producer and then write some message into the console to send to the `project.action.create` topic:
+  `bin/kafka-console-producer.sh --broker-list localhost:9092 --topic project.action.create`
+  in the console, write message, one message per line:
+  `{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-20T13:43:25.817Z","mime-type":"application/json","payload":{"resource":"project","createdAt":"2019-06-20T13:43:23.554Z","updatedAt":"2019-06-20T13:43:23.555Z","terms":[],"id":1,"name":"test project","description":"Hello I am a test project","type":"app","createdBy":40051333,"updatedBy":40051333,"projectEligibility":[],"bookmarks":[],"external":null,"status":"draft","lastActivityAt":"2019-06-20T13:43:23.514Z","lastActivityUserId":"40051333","members":[{"createdAt":"2019-06-20T13:43:23.555Z","updatedAt":"2019-06-20T13:43:23.625Z","id":2,"isPrimary":true,"role":"manager","userId":40051333,"updatedBy":40051333,"createdBy":40051333,"projectId":2,"deletedAt":null,"deletedBy":null}],"version":"v2","directProjectId":null,"billingAccountId":null,"estimatedPrice":null,"actualPrice":null,"details":null,"cancelReason":null,"templateId":null,"deletedBy":null,"attachments":null,"phases":null,"projectUrl":"https://connect.topcoder-dev.com/projects/2"}}`
+- Optionally, use another terminal, go to same directory, start a consumer to view the messages:
+  `bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic project.action.create --from-beginning`
+- If the kafka don't allow to input long message you can use this script to write message from file:
+  `path_to_kafka/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic project.action.create < our_project_root_directory/test/data/project/project.action.create.json`
+- Writing/reading messages to/from other topics are similar. All example for messages are in:
 `our_project_root_directory/test/data`
 
 ## Local Elasticsearch setup
@@ -124,8 +124,8 @@ npm run test:cov
 - Call extracted directory kafka_2.11-0.11.0.1 : `path_to_kafka`
 - Call our project root directory : `our_project_root_directory`
 - Start kafka server, start elasticsearch, initialize Elasticsearch, start processor app
-- Send message:  
-  `path_to_kafka/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic project.notification.create < our_project_root_directory/test/data/project/project.notification.create.json`
+- Send message:
+  `path_to_kafka/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic project.action.create < our_project_root_directory/test/data/project/project.action.create.json`
 - run command `npm run view-data projects 1` to view the created data, you will see the data are properly created:
 
 ```bash
@@ -177,18 +177,18 @@ info: {
 ```
 
 
-- Run the producer and then write some invalid message into the console to send to the `project.notification.create` topic:  
-  `bin/kafka-console-producer.sh --broker-list localhost:9092 --topic project.notification.create`  
-  in the console, write message, one message per line:  
-  `{ "topic": "project.notification.create", "originator": "project-api", "timestamp": "2019-02-16T00:00:00", "mime-type": "application/json", "payload": { "id": "invalid", "typeId": "8e17090c-465b-4c17-b6d9-dfa16300b0ff", "track": "Code", "name": "test", "description": "desc", "timelineTemplateId": "8e17090c-465b-4c17-b6d9-dfa16300b0aa", "phases": [{ "id": "8e17090c-465b-4c17-b6d9-dfa16300b012", "name": "review", "isActive": true, "duration": 10000 }], "prizeSets": [{ "type": "prize", "prizes": [{ "type": "winning prize", "value": 500 }] }], "reviewType": "code review", "tags": ["code"], "projectId": 123, "forumId": 456, "status": "Active", "created": "2019-02-16T00:00:00", "createdBy": "admin" } }`
+- Run the producer and then write some invalid message into the console to send to the `project.action.create` topic:
+  `bin/kafka-console-producer.sh --broker-list localhost:9092 --topic project.action.create`
+  in the console, write message, one message per line:
+  `{ "topic": "project.action.create", "originator": "project-api", "timestamp": "2019-02-16T00:00:00", "mime-type": "application/json", "payload": { "id": "invalid", "typeId": "8e17090c-465b-4c17-b6d9-dfa16300b0ff", "track": "Code", "name": "test", "description": "desc", "timelineTemplateId": "8e17090c-465b-4c17-b6d9-dfa16300b0aa", "phases": [{ "id": "8e17090c-465b-4c17-b6d9-dfa16300b012", "name": "review", "isActive": true, "duration": 10000 }], "prizeSets": [{ "type": "prize", "prizes": [{ "type": "winning prize", "value": 500 }] }], "reviewType": "code review", "tags": ["code"], "projectId": 123, "forumId": 456, "status": "Active", "created": "2019-02-16T00:00:00", "createdBy": "admin" } }`
 
-  `{ "topic": "project.notification.create", "originator": "project-api", "timestamp": "2019-02-16T00:00:00", "mime-type": "application/json", "payload": { "id": "173803d3-019e-4033-b1cf-d7205c7f774c", "typeId": "8e17090c-465b-4c17-b6d9-dfa16300b0ff", "track": "Code", "name": "test", "description": "desc", "timelineTemplateId": "8e17090c-465b-4c17-b6d9-dfa16300b0aa", "phases": [{ "id": "8e17090c-465b-4c17-b6d9-dfa16300b012", "name": "review", "isActive": true, "duration": 10000 }], "prizeSets": [{ "type": "prize", "prizes": [{ "type": "winning prize", "value": 500 }] }], "reviewType": "code review", "tags": ["code"], "projectId": 123, "forumId": -456, "status": "Active", "created": "2018-01-02T00:00:00", "createdBy": "admin" } }`
+  `{ "topic": "project.action.create", "originator": "project-api", "timestamp": "2019-02-16T00:00:00", "mime-type": "application/json", "payload": { "id": "173803d3-019e-4033-b1cf-d7205c7f774c", "typeId": "8e17090c-465b-4c17-b6d9-dfa16300b0ff", "track": "Code", "name": "test", "description": "desc", "timelineTemplateId": "8e17090c-465b-4c17-b6d9-dfa16300b0aa", "phases": [{ "id": "8e17090c-465b-4c17-b6d9-dfa16300b012", "name": "review", "isActive": true, "duration": 10000 }], "prizeSets": [{ "type": "prize", "prizes": [{ "type": "winning prize", "value": 500 }] }], "reviewType": "code review", "tags": ["code"], "projectId": 123, "forumId": -456, "status": "Active", "created": "2018-01-02T00:00:00", "createdBy": "admin" } }`
 
   `{ [ { abc`
 - Then in the app console, you will see error messages
 
-- Sent message to update data:  
-  `path_to_kafka/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic project.notification.update < our_project_root_directory/test/data/project/project.notification.update.json`
+- Sent message to update data:
+  `path_to_kafka/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic project.action.update < our_project_root_directory/test/data/project/project.action.update.json`
 - Run command `npm run view-data projects 1` to view the updated data, you will see the data are properly updated:
 
 ```bash
@@ -242,15 +242,15 @@ info: {
 ```
 
 
-- Run the producer and then write some invalid message into the console to send to the `project.notification.create` topic:  
-  `bin/kafka-console-producer.sh --broker-list localhost:9092 --topic project.notification.create`
-  in the console, write message, one message per line:  
-  `{ "topic": "project.notification.update", "originator": "project-api", "timestamp": "2019-02-17T01:00:00", "mime-type": "application/json", "payload": { "id": "173803d3-019e-4033-b1cf-d7205c7f774c", "typeId": "123", "track": "Code", "name": "test3", "description": "desc3", "timelineTemplateId": "8e17090c-465b-4c17-b6d9-dfa16300b0dd", "groups": ["group2", "group3"], "updated": "2019-02-17T01:00:00", "updatedBy": "admin" } }`
+- Run the producer and then write some invalid message into the console to send to the `project.action.create` topic:
+  `bin/kafka-console-producer.sh --broker-list localhost:9092 --topic project.action.create`
+  in the console, write message, one message per line:
+  `{ "topic": "project.action.update", "originator": "project-api", "timestamp": "2019-02-17T01:00:00", "mime-type": "application/json", "payload": { "id": "173803d3-019e-4033-b1cf-d7205c7f774c", "typeId": "123", "track": "Code", "name": "test3", "description": "desc3", "timelineTemplateId": "8e17090c-465b-4c17-b6d9-dfa16300b0dd", "groups": ["group2", "group3"], "updated": "2019-02-17T01:00:00", "updatedBy": "admin" } }`
 
-  `{ "topic": "project.notification.update", "originator": "project-api", "timestamp": "2019-02-17T01:00:00", "mime-type": "application/json", "payload": { "id": "173803d3-019e-4033-b1cf-d7205c7f774c", "typeId": "8e17090c-465b-4c17-b6d9-dfa16300b0ff", "track": ["Code"], "name": "test3", "description": "desc3", "timelineTemplateId": "8e17090c-465b-4c17-b6d9-dfa16300b0dd", "groups": ["group2", "group3"], "updated": "2019-02-17T01:00:00", "updatedBy": "admin" } }`
+  `{ "topic": "project.action.update", "originator": "project-api", "timestamp": "2019-02-17T01:00:00", "mime-type": "application/json", "payload": { "id": "173803d3-019e-4033-b1cf-d7205c7f774c", "typeId": "8e17090c-465b-4c17-b6d9-dfa16300b0ff", "track": ["Code"], "name": "test3", "description": "desc3", "timelineTemplateId": "8e17090c-465b-4c17-b6d9-dfa16300b0dd", "groups": ["group2", "group3"], "updated": "2019-02-17T01:00:00", "updatedBy": "admin" } }`
 
   `[ [ [ } } }`
-  
+
 - Then in the app console, you will see error messages
 
 - To test the health check API, run `export PORT=5000`, start the processor, then browse `http://localhost:5000/health` in a browser,
diff --git a/config/default.js b/config/default.js
index 74036ff..e8f2d8b 100644
--- a/config/default.js
+++ b/config/default.js
@@ -12,9 +12,9 @@ module.exports = {
   KAFKA_CLIENT_CERT: process.env.KAFKA_CLIENT_CERT,
   KAFKA_CLIENT_CERT_KEY: process.env.KAFKA_CLIENT_CERT_KEY,
 
-  CREATE_DATA_TOPIC: process.env.CREATE_DATA_TOPIC || 'project.notification.create',
-  UPDATE_DATA_TOPIC: process.env.UPDATE_DATA_TOPIC || 'project.notification.update',
-  DELETE_DATA_TOPIC: process.env.DELETE_DATA_TOPIC || 'project.notification.delete',
+  CREATE_DATA_TOPIC: process.env.CREATE_DATA_TOPIC || 'project.action.create',
+  UPDATE_DATA_TOPIC: process.env.UPDATE_DATA_TOPIC || 'project.action.update',
+  DELETE_DATA_TOPIC: process.env.DELETE_DATA_TOPIC || 'project.action.delete',
   KAFKA_MESSAGE_ORIGINATOR: process.env.KAFKA_MESSAGE_ORIGINATOR || 'project-api',
 
   esConfig: {
diff --git a/test/common/testData.js b/test/common/testData.js
index d489570..493df0e 100644
--- a/test/common/testData.js
+++ b/test/common/testData.js
@@ -13,108 +13,108 @@ function getRandomInt (max) {
   return Math.floor(Math.random() * Math.floor(max))
 }
 
-const projectCreatedMessage = require('../data/project/project.notification.create.json')
-const projectUpdatedMessage = require('../data/project/project.notification.update.json')
-const projectDeletedMessage = require('../data/project/project.notification.delete.json')
+const projectCreatedMessage = require('../data/project/project.action.create.json')
+const projectUpdatedMessage = require('../data/project/project.action.update.json')
+const projectDeletedMessage = require('../data/project/project.action.delete.json')
 
-const attachmentCreatedMessage = require('../data/attachment/project.notification.create.json')
-const attachmentUpdatedMessage = require('../data/attachment/project.notification.update.json')
-const attachmentDeletedMessage = require('../data/attachment/project.notification.delete.json')
+const attachmentCreatedMessage = require('../data/attachment/project.action.create.json')
+const attachmentUpdatedMessage = require('../data/attachment/project.action.update.json')
+const attachmentDeletedMessage = require('../data/attachment/project.action.delete.json')
 
-const timelineCreatedMessage = require('../data/timeline/project.notification.create.json')
-const timelineUpdatedMessage = require('../data/timeline/project.notification.update.json')
-const timelineDeletedMessage = require('../data/timeline/project.notification.delete.json')
+const timelineCreatedMessage = require('../data/timeline/project.action.create.json')
+const timelineUpdatedMessage = require('../data/timeline/project.action.update.json')
+const timelineDeletedMessage = require('../data/timeline/project.action.delete.json')
 
-const milestoneCreatedMessage = require('../data/milestone/project.notification.create.json')
-const milestoneUpdatedMessage = require('../data/milestone/project.notification.update.json')
-const milestoneDeletedMessage = require('../data/milestone/project.notification.delete.json')
+const milestoneCreatedMessage = require('../data/milestone/project.action.create.json')
+const milestoneUpdatedMessage = require('../data/milestone/project.action.update.json')
+const milestoneDeletedMessage = require('../data/milestone/project.action.delete.json')
 
-const milestoneTemplateCreatedMessage = require('../data/milestone.template/project.notification.create.json')
-const milestoneTemplateUpdatedMessage = require('../data/milestone.template/project.notification.update.json')
-const milestoneTemplateDeletedMessage = require('../data/milestone.template/project.notification.delete.json')
+const milestoneTemplateCreatedMessage = require('../data/milestone.template/project.action.create.json')
+const milestoneTemplateUpdatedMessage = require('../data/milestone.template/project.action.update.json')
+const milestoneTemplateDeletedMessage = require('../data/milestone.template/project.action.delete.json')
 
-const phaseCreatedMessage = require('../data/phase/project.notification.create.json')
-const phaseUpdatedMessage = require('../data/phase/project.notification.update.json')
-const phaseDeletedMessage = require('../data/phase/project.notification.delete.json')
+const phaseCreatedMessage = require('../data/phase/project.action.create.json')
+const phaseUpdatedMessage = require('../data/phase/project.action.update.json')
+const phaseDeletedMessage = require('../data/phase/project.action.delete.json')
 
-const phaseProductCreatedMessage = require('../data/phase.product/project.notification.create.json')
-const phaseProductUpdatedMessage = require('../data/phase.product/project.notification.update.json')
-const phaseProductDeletedMessage = require('../data/phase.product/project.notification.delete.json')
+const phaseProductCreatedMessage = require('../data/phase.product/project.action.create.json')
+const phaseProductUpdatedMessage = require('../data/phase.product/project.action.update.json')
+const phaseProductDeletedMessage = require('../data/phase.product/project.action.delete.json')
 
-const productTemplateCreatedMessage = require('../data/product.template/project.notification.create.json')
-const productTemplateUpdatedMessage = require('../data/product.template/project.notification.update.json')
-const productTemplateDeletedMessage = require('../data/product.template/project.notification.delete.json')
+const productTemplateCreatedMessage = require('../data/product.template/project.action.create.json')
+const productTemplateUpdatedMessage = require('../data/product.template/project.action.update.json')
+const productTemplateDeletedMessage = require('../data/product.template/project.action.delete.json')
 
 const projectFormRevisionCreatedMessage = require(
-  '../data/project.form.revision/project.notification.create.json'
+  '../data/project.form.revision/project.action.create.json'
 )
 const projectFormRevisionDeletedMessage = require(
-  '../data/project.form.revision/project.notification.delete.json'
+  '../data/project.form.revision/project.action.delete.json'
 )
 
-const projectFormVersionCreatedMessage = require('../data/project.form.version/project.notification.create.json')
-const projectFormVersionUpdatedMessage = require('../data/project.form.version/project.notification.update.json')
-const projectFormVersionDeletedMessage = require('../data/project.form.version/project.notification.delete.json')
+const projectFormVersionCreatedMessage = require('../data/project.form.version/project.action.create.json')
+const projectFormVersionUpdatedMessage = require('../data/project.form.version/project.action.update.json')
+const projectFormVersionDeletedMessage = require('../data/project.form.version/project.action.delete.json')
 
 const projectPlanConfigRevisionCreatedMessage = require(
-  '../data/project.planConfig.revision/project.notification.create.json'
+  '../data/project.planConfig.revision/project.action.create.json'
 )
 const projectPlanConfigRevisionDeletedMessage = require(
-  '../data/project.planConfig.revision/project.notification.delete.json'
+  '../data/project.planConfig.revision/project.action.delete.json'
 )
 
 const projectPlanConfigVersionCreatedMessage = require(
-  '../data/project.planConfig.version/project.notification.create.json'
+  '../data/project.planConfig.version/project.action.create.json'
 )
 const projectPlanConfigVersionUpdatedMessage = require(
-  '../data/project.planConfig.version/project.notification.update.json'
+  '../data/project.planConfig.version/project.action.update.json'
 )
 const projectPlanConfigVersionDeletedMessage = require(
-  '../data/project.planConfig.version/project.notification.delete.json'
+  '../data/project.planConfig.version/project.action.delete.json'
 )
 
 const projectPriceConfigRevisionCreatedMessage = require(
-  '../data/project.priceConfig.revision/project.notification.create.json'
+  '../data/project.priceConfig.revision/project.action.create.json'
 )
 const projectPriceConfigRevisionDeletedMessage = require(
-  '../data/project.priceConfig.revision/project.notification.delete.json'
+  '../data/project.priceConfig.revision/project.action.delete.json'
 )
 
 const projectPriceConfigVersionCreatedMessage = require(
-  '../data/project.priceConfig.version/project.notification.create.json'
+  '../data/project.priceConfig.version/project.action.create.json'
 )
 const projectPriceConfigVersionUpdatedMessage = require(
-  '../data/project.priceConfig.version/project.notification.update.json'
+  '../data/project.priceConfig.version/project.action.update.json'
 )
 const projectPriceConfigVersionDeletedMessage = require(
-  '../data/project.priceConfig.version/project.notification.delete.json'
+  '../data/project.priceConfig.version/project.action.delete.json'
 )
 
-const projectMemberCreatedMessage = require('../data/project.member/project.notification.create.json')
-const projectMemberUpdatedMessage = require('../data/project.member/project.notification.update.json')
-const projectMemberDeletedMessage = require('../data/project.member/project.notification.delete.json')
+const projectMemberCreatedMessage = require('../data/project.member/project.action.create.json')
+const projectMemberUpdatedMessage = require('../data/project.member/project.action.update.json')
+const projectMemberDeletedMessage = require('../data/project.member/project.action.delete.json')
 
 const projectMemberInviteCreatedMessage = require(
-  '../data/project.member.invite/project.notification.create.json'
+  '../data/project.member.invite/project.action.create.json'
 )
 const projectMemberInviteUpdatedMessage = require(
-  '../data/project.member.invite/project.notification.update.json'
+  '../data/project.member.invite/project.action.update.json'
 )
-const orgConfigCreatedMessage = require('../data/project.orgConfig/project.notification.create.json')
-const orgConfigUpdatedMessage = require('../data/project.orgConfig/project.notification.update.json')
-const orgConfigDeletedMessage = require('../data/project.orgConfig/project.notification.delete.json')
+const orgConfigCreatedMessage = require('../data/project.orgConfig/project.action.create.json')
+const orgConfigUpdatedMessage = require('../data/project.orgConfig/project.action.update.json')
+const orgConfigDeletedMessage = require('../data/project.orgConfig/project.action.delete.json')
 
-const projectTemplateCreatedMessage = require('../data/project.template/project.notification.create.json')
-const projectTemplateUpdatedMessage = require('../data/project.template/project.notification.update.json')
-const projectTemplateDeletedMessage = require('../data/project.template/project.notification.delete.json')
+const projectTemplateCreatedMessage = require('../data/project.template/project.action.create.json')
+const projectTemplateUpdatedMessage = require('../data/project.template/project.action.update.json')
+const projectTemplateDeletedMessage = require('../data/project.template/project.action.delete.json')
 
-const projectTypeCreatedMessage = require('../data/project.type/project.notification.create.json')
-const projectTypeUpdatedMessage = require('../data/project.type/project.notification.update.json')
-const projectTypeDeletedMessage = require('../data/project.type/project.notification.delete.json')
+const projectTypeCreatedMessage = require('../data/project.type/project.action.create.json')
+const projectTypeUpdatedMessage = require('../data/project.type/project.action.update.json')
+const projectTypeDeletedMessage = require('../data/project.type/project.action.delete.json')
 
-const productCategoryCreatedMessage = require('../data/product.category/project.notification.create.json')
-const productCategoryUpdatedMessage = require('../data/product.category/project.notification.update.json')
-const productCategoryDeletedMessage = require('../data/product.category/project.notification.delete.json')
+const productCategoryCreatedMessage = require('../data/product.category/project.action.create.json')
+const productCategoryUpdatedMessage = require('../data/product.category/project.action.update.json')
+const productCategoryDeletedMessage = require('../data/product.category/project.action.delete.json')
 
 const projectId = projectCreatedMessage.payload.id
 const timelineId = timelineCreatedMessage.payload.id
diff --git a/test/data/attachment/project.action.create.json b/test/data/attachment/project.action.create.json
new file mode 100644
index 0000000..5901ca5
--- /dev/null
+++ b/test/data/attachment/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:41:17.702Z","mime-type":"application/json","payload":{"resource":"attachment","createdAt":"2019-06-21T04:41:17.637Z","updatedAt":"2019-06-21T04:41:17.637Z","id":1,"projectId":1,"allowedUsers":null,"createdBy":40051333,"updatedBy":40051333,"title":"first attachment submission","size":null,"category":null,"description":null,"contentType":"application/png","deletedBy":null,"downloadUrl":"projects/1/projects/asdasd.png"}}
\ No newline at end of file
diff --git a/test/data/attachment/project.action.delete.json b/test/data/attachment/project.action.delete.json
new file mode 100644
index 0000000..9bfa4f0
--- /dev/null
+++ b/test/data/attachment/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-21T04:42:17.174Z","mime-type":"application/json","payload":{"resource":"attachment","id":1,"projectId":1}}
\ No newline at end of file
diff --git a/test/data/attachment/project.action.update.json b/test/data/attachment/project.action.update.json
new file mode 100644
index 0000000..09a6590
--- /dev/null
+++ b/test/data/attachment/project.action.update.json
@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T04:41:46.501Z","mime-type":"application/json","payload":{"resource":"attachment","title":"first attachment submission updated","description":"updated project attachment","allowedUsers":null,"updatedBy":40051333,"id":1,"projectId":1}}
\ No newline at end of file
diff --git a/test/data/attachment/project.notification.create.json b/test/data/attachment/project.notification.create.json
deleted file mode 100644
index bfbd966..0000000
--- a/test/data/attachment/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-21T04:41:17.702Z","mime-type":"application/json","payload":{"resource":"attachment","createdAt":"2019-06-21T04:41:17.637Z","updatedAt":"2019-06-21T04:41:17.637Z","id":1,"projectId":1,"allowedUsers":null,"createdBy":40051333,"updatedBy":40051333,"title":"first attachment submission","size":null,"category":null,"description":null,"contentType":"application/png","deletedBy":null,"downloadUrl":"projects/1/projects/asdasd.png"}}
\ No newline at end of file
diff --git a/test/data/attachment/project.notification.delete.json b/test/data/attachment/project.notification.delete.json
deleted file mode 100644
index 001debd..0000000
--- a/test/data/attachment/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-21T04:42:17.174Z","mime-type":"application/json","payload":{"resource":"attachment","id":1,"projectId":1}}
\ No newline at end of file
diff --git a/test/data/attachment/project.notification.update.json b/test/data/attachment/project.notification.update.json
deleted file mode 100644
index db9bd88..0000000
--- a/test/data/attachment/project.notification.update.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.update","originator":"project-api","timestamp":"2019-06-21T04:41:46.501Z","mime-type":"application/json","payload":{"resource":"attachment","title":"first attachment submission updated","description":"updated project attachment","allowedUsers":null,"updatedBy":40051333,"id":1,"projectId":1}}
\ No newline at end of file
diff --git a/test/data/milestone.template/project.action.create.json b/test/data/milestone.template/project.action.create.json
new file mode 100644
index 0000000..c414499
--- /dev/null
+++ b/test/data/milestone.template/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:56:51.955Z","mime-type":"application/json","payload":{"resource":"milestone.template","createdAt":"2019-06-21T04:56:51.878Z","updatedAt":"2019-06-21T04:56:51.878Z","hidden":false,"id":1,"name":"milestoneTemplate 3","description":"description 3","duration":33,"type":"type3","order":1,"activeText":"activeText 1","completedText":"completedText 1","blockedText":"blockedText 1","plannedText":"planned Text 1","reference":"productTemplate","referenceId":1,"metadata":{},"createdBy":40051333,"updatedBy":40051333}}
\ No newline at end of file
diff --git a/test/data/milestone.template/project.action.delete.json b/test/data/milestone.template/project.action.delete.json
new file mode 100644
index 0000000..18ec33a
--- /dev/null
+++ b/test/data/milestone.template/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-21T04:57:34.529Z","mime-type":"application/json","payload":{"resource":"milestone.template","id":1}}
\ No newline at end of file
diff --git a/test/data/milestone.template/project.action.update.json b/test/data/milestone.template/project.action.update.json
new file mode 100644
index 0000000..94ecc18
--- /dev/null
+++ b/test/data/milestone.template/project.action.update.json
@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T04:57:20.281Z","mime-type":"application/json","payload":{"resource":"milestone.template","name":"milestoneTemplate 1-updated","description":"description 1-updated","duration":34,"type":"type1-updated","order":1,"reference":"productTemplate","referenceId":1,"updatedBy":40051333,"metadata":{},"id":1}}
\ No newline at end of file
diff --git a/test/data/milestone.template/project.notification.create.json b/test/data/milestone.template/project.notification.create.json
deleted file mode 100644
index fdada75..0000000
--- a/test/data/milestone.template/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-21T04:56:51.955Z","mime-type":"application/json","payload":{"resource":"milestone.template","createdAt":"2019-06-21T04:56:51.878Z","updatedAt":"2019-06-21T04:56:51.878Z","hidden":false,"id":1,"name":"milestoneTemplate 3","description":"description 3","duration":33,"type":"type3","order":1,"activeText":"activeText 1","completedText":"completedText 1","blockedText":"blockedText 1","plannedText":"planned Text 1","reference":"productTemplate","referenceId":1,"metadata":{},"createdBy":40051333,"updatedBy":40051333}}
\ No newline at end of file
diff --git a/test/data/milestone.template/project.notification.delete.json b/test/data/milestone.template/project.notification.delete.json
deleted file mode 100644
index 4e77982..0000000
--- a/test/data/milestone.template/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-21T04:57:34.529Z","mime-type":"application/json","payload":{"resource":"milestone.template","id":1}}
\ No newline at end of file
diff --git a/test/data/milestone.template/project.notification.update.json b/test/data/milestone.template/project.notification.update.json
deleted file mode 100644
index 7950a26..0000000
--- a/test/data/milestone.template/project.notification.update.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.update","originator":"project-api","timestamp":"2019-06-21T04:57:20.281Z","mime-type":"application/json","payload":{"resource":"milestone.template","name":"milestoneTemplate 1-updated","description":"description 1-updated","duration":34,"type":"type1-updated","order":1,"reference":"productTemplate","referenceId":1,"updatedBy":40051333,"metadata":{},"id":1}}
\ No newline at end of file
diff --git a/test/data/milestone/project.action.create.json b/test/data/milestone/project.action.create.json
new file mode 100644
index 0000000..612bac4
--- /dev/null
+++ b/test/data/milestone/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-22T17:25:50.804Z","mime-type":"application/json","payload":{"resource":"milestone","createdAt":"2019-06-22T17:25:50.682Z","updatedAt":"2019-06-22T17:25:50.682Z","hidden":false,"id":1,"timelineId":1,"name":"milestone 3","description":"description 3","duration":4,"startDate":"2018-05-29T00:00:00.000Z","endDate":"2018-05-30T00:00:00.000Z","completionDate":"2018-06-30T00:00:00.000Z","status":"open","type":"type3","details":{"detail1":{"subDetail1C":3},"detail2":[2,3,4]},"order":1,"plannedText":"plannedText 3","activeText":"activeText 3","completedText":"completedText 3","blockedText":"blockedText 3","createdBy":40051333,"updatedBy":40051333,"actualStartDate":null}}
\ No newline at end of file
diff --git a/test/data/milestone/project.action.delete.json b/test/data/milestone/project.action.delete.json
new file mode 100644
index 0000000..9255571
--- /dev/null
+++ b/test/data/milestone/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-22T17:27:16.704Z","mime-type":"application/json","payload":{"resource":"milestone","id":1,"timelineId":1}}
\ No newline at end of file
diff --git a/test/data/milestone/project.action.update.json b/test/data/milestone/project.action.update.json
new file mode 100644
index 0000000..dc79329
--- /dev/null
+++ b/test/data/milestone/project.action.update.json
@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-22T17:26:49.920Z","mime-type":"application/json","payload":{"resource":"milestone","name":"milestone 1-updated","description":"description-updated","duration":3,"completionDate":"2018-09-28T00:00:00.000Z","status":"closed","type":"type2","details":{"detail1":{"subDetail1C":3},"detail2":[4]},"order":1,"plannedText":"plannedText 1-updated","activeText":"activeText 1-updated","completedText":"completedText 1-updated","blockedText":"blockedText 1-updated","updatedBy":40051333,"endDate":"2018-05-31T00:00:00.000Z","id":1,"timelineId":1}}
\ No newline at end of file
diff --git a/test/data/milestone/project.notification.create.json b/test/data/milestone/project.notification.create.json
deleted file mode 100644
index 57bffbf..0000000
--- a/test/data/milestone/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-22T17:25:50.804Z","mime-type":"application/json","payload":{"resource":"milestone","createdAt":"2019-06-22T17:25:50.682Z","updatedAt":"2019-06-22T17:25:50.682Z","hidden":false,"id":1,"timelineId":1,"name":"milestone 3","description":"description 3","duration":4,"startDate":"2018-05-29T00:00:00.000Z","endDate":"2018-05-30T00:00:00.000Z","completionDate":"2018-06-30T00:00:00.000Z","status":"open","type":"type3","details":{"detail1":{"subDetail1C":3},"detail2":[2,3,4]},"order":1,"plannedText":"plannedText 3","activeText":"activeText 3","completedText":"completedText 3","blockedText":"blockedText 3","createdBy":40051333,"updatedBy":40051333,"actualStartDate":null}}
\ No newline at end of file
diff --git a/test/data/milestone/project.notification.delete.json b/test/data/milestone/project.notification.delete.json
deleted file mode 100644
index 31f0654..0000000
--- a/test/data/milestone/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-22T17:27:16.704Z","mime-type":"application/json","payload":{"resource":"milestone","id":1,"timelineId":1}}
\ No newline at end of file
diff --git a/test/data/milestone/project.notification.update.json b/test/data/milestone/project.notification.update.json
deleted file mode 100644
index 5747ec0..0000000
--- a/test/data/milestone/project.notification.update.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.update","originator":"project-api","timestamp":"2019-06-22T17:26:49.920Z","mime-type":"application/json","payload":{"resource":"milestone","name":"milestone 1-updated","description":"description-updated","duration":3,"completionDate":"2018-09-28T00:00:00.000Z","status":"closed","type":"type2","details":{"detail1":{"subDetail1C":3},"detail2":[4]},"order":1,"plannedText":"plannedText 1-updated","activeText":"activeText 1-updated","completedText":"completedText 1-updated","blockedText":"blockedText 1-updated","updatedBy":40051333,"endDate":"2018-05-31T00:00:00.000Z","id":1,"timelineId":1}}
\ No newline at end of file
diff --git a/test/data/phase.product/project.action.create.json b/test/data/phase.product/project.action.create.json
new file mode 100644
index 0000000..c58c1bb
--- /dev/null
+++ b/test/data/phase.product/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:47:13.545Z","mime-type":"application/json","payload":{"resource":"phase.product","createdAt":"2019-06-21T04:47:13.486Z","updatedAt":"2019-06-21T04:47:13.486Z","templateId":1,"actualPrice":1,"details":{},"id":1,"projectId":1,"phaseId":1,"name":"test phase product","type":"type 1","estimatedPrice":10,"createdBy":40051333,"updatedBy":40051333,"directProjectId":null,"billingAccountId":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/phase.product/project.action.delete.json b/test/data/phase.product/project.action.delete.json
new file mode 100644
index 0000000..6175a81
--- /dev/null
+++ b/test/data/phase.product/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-21T04:48:03.668Z","mime-type":"application/json","payload":{"resource":"phase.product","id":1,"projectId":1,"phaseId":1}}
\ No newline at end of file
diff --git a/test/data/phase.product/project.action.update.json b/test/data/phase.product/project.action.update.json
new file mode 100644
index 0000000..9847f9a
--- /dev/null
+++ b/test/data/phase.product/project.action.update.json
@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T04:47:43.880Z","mime-type":"application/json","payload":{"resource":"phase.product","name":"test phase product xxx","type":"type 2","templateId":10,"estimatedPrice":1.234567,"actualPrice":2.34567,"details":{"message":"this is a JSON type. You can use any json"},"updatedBy":40051333,"id":1,"projectId":1,"phaseId":1}}
\ No newline at end of file
diff --git a/test/data/phase.product/project.notification.create.json b/test/data/phase.product/project.notification.create.json
deleted file mode 100644
index d9e8b0c..0000000
--- a/test/data/phase.product/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-21T04:47:13.545Z","mime-type":"application/json","payload":{"resource":"phase.product","createdAt":"2019-06-21T04:47:13.486Z","updatedAt":"2019-06-21T04:47:13.486Z","templateId":1,"actualPrice":1,"details":{},"id":1,"projectId":1,"phaseId":1,"name":"test phase product","type":"type 1","estimatedPrice":10,"createdBy":40051333,"updatedBy":40051333,"directProjectId":null,"billingAccountId":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/phase.product/project.notification.delete.json b/test/data/phase.product/project.notification.delete.json
deleted file mode 100644
index 226d5f5..0000000
--- a/test/data/phase.product/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-21T04:48:03.668Z","mime-type":"application/json","payload":{"resource":"phase.product","id":1,"projectId":1,"phaseId":1}}
\ No newline at end of file
diff --git a/test/data/phase.product/project.notification.update.json b/test/data/phase.product/project.notification.update.json
deleted file mode 100644
index 2557203..0000000
--- a/test/data/phase.product/project.notification.update.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.update","originator":"project-api","timestamp":"2019-06-21T04:47:43.880Z","mime-type":"application/json","payload":{"resource":"phase.product","name":"test phase product xxx","type":"type 2","templateId":10,"estimatedPrice":1.234567,"actualPrice":2.34567,"details":{"message":"this is a JSON type. You can use any json"},"updatedBy":40051333,"id":1,"projectId":1,"phaseId":1}}
\ No newline at end of file
diff --git a/test/data/phase/project.action.create.json b/test/data/phase/project.action.create.json
new file mode 100644
index 0000000..722c3cf
--- /dev/null
+++ b/test/data/phase/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:42:56.440Z","mime-type":"application/json","payload":{"resource":"phase","createdAt":"2019-06-21T04:42:56.309Z","updatedAt":"2019-06-21T04:42:56.310Z","spentBudget":0,"progress":0,"id":1,"name":"test project phase","status":"active","startDate":"2018-05-14T17:00:00.000Z","endDate":"2018-05-15T17:00:00.000Z","budget":20,"details":{"aDetails":"a details"},"projectId":1,"createdBy":40051333,"updatedBy":40051333,"duration":null,"order":1}}
\ No newline at end of file
diff --git a/test/data/phase/project.action.delete.json b/test/data/phase/project.action.delete.json
new file mode 100644
index 0000000..f56788e
--- /dev/null
+++ b/test/data/phase/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-21T04:43:37.832Z","mime-type":"application/json","payload":{"resource":"phase","id":1,"projectId":1}}
\ No newline at end of file
diff --git a/test/data/phase/project.action.update.json b/test/data/phase/project.action.update.json
new file mode 100644
index 0000000..d86a359
--- /dev/null
+++ b/test/data/phase/project.action.update.json
@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T04:43:19.740Z","mime-type":"application/json","payload":{"resource":"phase","name":"test project phase xxx","status":"inactive","startDate":"2018-05-13T17:00:00.000Z","endDate":"2018-05-14T17:00:00.000Z","budget":30,"progress":15,"details":{"message":"phase details"},"updatedBy":40051333,"id":1,"projectId":1}}
\ No newline at end of file
diff --git a/test/data/phase/project.notification.create.json b/test/data/phase/project.notification.create.json
deleted file mode 100644
index 08e681a..0000000
--- a/test/data/phase/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-21T04:42:56.440Z","mime-type":"application/json","payload":{"resource":"phase","createdAt":"2019-06-21T04:42:56.309Z","updatedAt":"2019-06-21T04:42:56.310Z","spentBudget":0,"progress":0,"id":1,"name":"test project phase","status":"active","startDate":"2018-05-14T17:00:00.000Z","endDate":"2018-05-15T17:00:00.000Z","budget":20,"details":{"aDetails":"a details"},"projectId":1,"createdBy":40051333,"updatedBy":40051333,"duration":null,"order":1}}
\ No newline at end of file
diff --git a/test/data/phase/project.notification.delete.json b/test/data/phase/project.notification.delete.json
deleted file mode 100644
index 4509d4a..0000000
--- a/test/data/phase/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-21T04:43:37.832Z","mime-type":"application/json","payload":{"resource":"phase","id":1,"projectId":1}}
\ No newline at end of file
diff --git a/test/data/phase/project.notification.update.json b/test/data/phase/project.notification.update.json
deleted file mode 100644
index 169dbb4..0000000
--- a/test/data/phase/project.notification.update.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.update","originator":"project-api","timestamp":"2019-06-21T04:43:19.740Z","mime-type":"application/json","payload":{"resource":"phase","name":"test project phase xxx","status":"inactive","startDate":"2018-05-13T17:00:00.000Z","endDate":"2018-05-14T17:00:00.000Z","budget":30,"progress":15,"details":{"message":"phase details"},"updatedBy":40051333,"id":1,"projectId":1}}
\ No newline at end of file
diff --git a/test/data/product.category/project.action.create.json b/test/data/product.category/project.action.create.json
new file mode 100644
index 0000000..cc64219
--- /dev/null
+++ b/test/data/product.category/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:36:00.714Z","mime-type":"application/json","payload":{"resource":"product.category","createdAt":"2019-06-21T04:36:00.684Z","updatedAt":"2019-06-21T04:36:00.684Z","disabled":false,"hidden":false,"key":"generic","displayName":"new displayName","icon":"icon","question":"question","info":"info","form":[],"aliases":[{"key-1":"key-1"},{"key-2":"key-2"}],"createdBy":40135978,"updatedBy":40135978,"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/product.category/project.action.delete.json b/test/data/product.category/project.action.delete.json
new file mode 100644
index 0000000..917583f
--- /dev/null
+++ b/test/data/product.category/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-21T04:37:08.671Z","mime-type":"application/json","payload":{"resource":"product.category","key":"generic"}}
\ No newline at end of file
diff --git a/test/data/product.category/project.action.update.json b/test/data/product.category/project.action.update.json
new file mode 100644
index 0000000..162fac6
--- /dev/null
+++ b/test/data/product.category/project.action.update.json
@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T04:36:28.744Z","mime-type":"application/json","payload":{"resource":"product.category","displayName":"Chatbot-updated","updatedBy":40135978,"key":"generic"}}
\ No newline at end of file
diff --git a/test/data/product.category/project.notification.create.json b/test/data/product.category/project.notification.create.json
deleted file mode 100644
index 758ddf1..0000000
--- a/test/data/product.category/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-21T04:36:00.714Z","mime-type":"application/json","payload":{"resource":"product.category","createdAt":"2019-06-21T04:36:00.684Z","updatedAt":"2019-06-21T04:36:00.684Z","disabled":false,"hidden":false,"key":"generic","displayName":"new displayName","icon":"icon","question":"question","info":"info","form":[],"aliases":[{"key-1":"key-1"},{"key-2":"key-2"}],"createdBy":40135978,"updatedBy":40135978,"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/product.category/project.notification.delete.json b/test/data/product.category/project.notification.delete.json
deleted file mode 100644
index a27284c..0000000
--- a/test/data/product.category/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-21T04:37:08.671Z","mime-type":"application/json","payload":{"resource":"product.category","key":"generic"}}
\ No newline at end of file
diff --git a/test/data/product.category/project.notification.update.json b/test/data/product.category/project.notification.update.json
deleted file mode 100644
index 970f5f9..0000000
--- a/test/data/product.category/project.notification.update.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.update","originator":"project-api","timestamp":"2019-06-21T04:36:28.744Z","mime-type":"application/json","payload":{"resource":"product.category","displayName":"Chatbot-updated","updatedBy":40135978,"key":"generic"}}
\ No newline at end of file
diff --git a/test/data/product.template/project.action.create.json b/test/data/product.template/project.action.create.json
new file mode 100644
index 0000000..74c05f6
--- /dev/null
+++ b/test/data/product.template/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:38:00.877Z","mime-type":"application/json","payload":{"resource":"product.template","createdAt":"2019-06-21T04:38:00.845Z","updatedAt":"2019-06-21T04:38:00.846Z","disabled":false,"hidden":false,"isAddOn":false,"id":1,"name":"name 1","productKey":"productKey 2","category":"generic","subCategory":"generic","icon":"http://example.com/icon1.ico","brief":"brief 1","details":"details 1","aliases":[{"alias1":"scope 1"},{"alias2":"scope 2"}],"template":{"template1":{"name":"template 1","details":{"anyDetails":"any details 1"},"others":["others 11","others 12"]},"template2":{"name":"template 2","details":{"anyDetails":"any details 2"},"others":["others 21","others 22"]}},"createdBy":40051333,"updatedBy":40051333,"form":null,"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/product.template/project.action.delete.json b/test/data/product.template/project.action.delete.json
new file mode 100644
index 0000000..64c5294
--- /dev/null
+++ b/test/data/product.template/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-21T04:39:28.733Z","mime-type":"application/json","payload":{"resource":"product.template","id":1}}
\ No newline at end of file
diff --git a/test/data/product.template/project.action.update.json b/test/data/product.template/project.action.update.json
new file mode 100644
index 0000000..66bcae2
--- /dev/null
+++ b/test/data/product.template/project.action.update.json
@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T04:39:17.757Z","mime-type":"application/json","payload":{"resource":"product.template","id": 1,"name":"new name","productKey":"new productKey","category":"generic1","icon":"http://example.com/icon-new.ico","brief":"new brief","details":"new details","aliases":[{"alias1":"scope 1 update"},{"alias2":"scope 2 update"}],"template":{"template1":{"name": "template 1 update"},"template2":{"name":"template 2 update","details":{"anyDetails":"any details 2"},"others":["others 21","others 22"],"another":"another"}},"updatedBy":40051333}}
\ No newline at end of file
diff --git a/test/data/product.template/project.notification.create.json b/test/data/product.template/project.notification.create.json
deleted file mode 100644
index ab6702c..0000000
--- a/test/data/product.template/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-21T04:38:00.877Z","mime-type":"application/json","payload":{"resource":"product.template","createdAt":"2019-06-21T04:38:00.845Z","updatedAt":"2019-06-21T04:38:00.846Z","disabled":false,"hidden":false,"isAddOn":false,"id":1,"name":"name 1","productKey":"productKey 2","category":"generic","subCategory":"generic","icon":"http://example.com/icon1.ico","brief":"brief 1","details":"details 1","aliases":[{"alias1":"scope 1"},{"alias2":"scope 2"}],"template":{"template1":{"name":"template 1","details":{"anyDetails":"any details 1"},"others":["others 11","others 12"]},"template2":{"name":"template 2","details":{"anyDetails":"any details 2"},"others":["others 21","others 22"]}},"createdBy":40051333,"updatedBy":40051333,"form":null,"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/product.template/project.notification.delete.json b/test/data/product.template/project.notification.delete.json
deleted file mode 100644
index 7ff1c8d..0000000
--- a/test/data/product.template/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-21T04:39:28.733Z","mime-type":"application/json","payload":{"resource":"product.template","id":1}}
\ No newline at end of file
diff --git a/test/data/product.template/project.notification.update.json b/test/data/product.template/project.notification.update.json
deleted file mode 100644
index 1b262fe..0000000
--- a/test/data/product.template/project.notification.update.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.update","originator":"project-api","timestamp":"2019-06-21T04:39:17.757Z","mime-type":"application/json","payload":{"resource":"product.template","id": 1,"name":"new name","productKey":"new productKey","category":"generic1","icon":"http://example.com/icon-new.ico","brief":"new brief","details":"new details","aliases":[{"alias1":"scope 1 update"},{"alias2":"scope 2 update"}],"template":{"template1":{"name": "template 1 update"},"template2":{"name":"template 2 update","details":{"anyDetails":"any details 2"},"others":["others 21","others 22"],"another":"another"}},"updatedBy":40051333}}
\ No newline at end of file
diff --git a/test/data/project.form.revision/project.action.create.json b/test/data/project.form.revision/project.action.create.json
new file mode 100644
index 0000000..dd50f9f
--- /dev/null
+++ b/test/data/project.form.revision/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T02:39:35.097Z","mime-type":"application/json","payload":{"resource":"project.form.revision","createdAt":"2019-06-21T02:39:35.069Z","updatedAt":"2019-06-21T02:39:35.069Z","id":2,"config":{"hello":"test"},"version":1,"revision":2,"createdBy":40051333,"updatedBy":40051333,"key":"dev","deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.form.revision/project.action.delete.json b/test/data/project.form.revision/project.action.delete.json
new file mode 100644
index 0000000..6fa3569
--- /dev/null
+++ b/test/data/project.form.revision/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-21T02:39:57.094Z","mime-type":"application/json","payload":{"resource":"project.form.revision","id":2}}
\ No newline at end of file
diff --git a/test/data/project.form.revision/project.notification.create.json b/test/data/project.form.revision/project.notification.create.json
deleted file mode 100644
index d4ea4f5..0000000
--- a/test/data/project.form.revision/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-21T02:39:35.097Z","mime-type":"application/json","payload":{"resource":"project.form.revision","createdAt":"2019-06-21T02:39:35.069Z","updatedAt":"2019-06-21T02:39:35.069Z","id":2,"config":{"hello":"test"},"version":1,"revision":2,"createdBy":40051333,"updatedBy":40051333,"key":"dev","deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.form.revision/project.notification.delete.json b/test/data/project.form.revision/project.notification.delete.json
deleted file mode 100644
index 3d3fdfc..0000000
--- a/test/data/project.form.revision/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-21T02:39:57.094Z","mime-type":"application/json","payload":{"resource":"project.form.revision","id":2}}
\ No newline at end of file
diff --git a/test/data/project.form.version/project.action.create.json b/test/data/project.form.version/project.action.create.json
new file mode 100644
index 0000000..fb8182e
--- /dev/null
+++ b/test/data/project.form.version/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T02:36:15.005Z","mime-type":"application/json","payload":{"resource":"project.form.version","createdAt":"2019-06-21T02:36:14.956Z","updatedAt":"2019-06-21T02:36:14.957Z","id":1,"config":{"hello":"test"},"version":1,"revision":1,"createdBy":40051333,"updatedBy":40051333,"key":"dev","deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.form.version/project.action.delete.json b/test/data/project.form.version/project.action.delete.json
new file mode 100644
index 0000000..7d76ed3
--- /dev/null
+++ b/test/data/project.form.version/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-21T02:36:57.757Z","mime-type":"application/json","payload":{"resource":"project.form.version","id":1}}
\ No newline at end of file
diff --git a/test/data/project.form.version/project.action.update.json b/test/data/project.form.version/project.action.update.json
new file mode 100644
index 0000000..310ddc6
--- /dev/null
+++ b/test/data/project.form.version/project.action.update.json
@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T02:36:34.611Z","mime-type":"application/json","payload":{"resource":"project.form.version","createdAt":"2019-06-21T02:36:34.574Z","updatedAt":"2019-06-21T02:36:34.574Z","id":1,"version":1,"revision":2,"createdBy":40051333,"updatedBy":40051333,"key":"dev","config":{"hello":"test111"},"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.form.version/project.notification.create.json b/test/data/project.form.version/project.notification.create.json
deleted file mode 100644
index 2680c4a..0000000
--- a/test/data/project.form.version/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-21T02:36:15.005Z","mime-type":"application/json","payload":{"resource":"project.form.version","createdAt":"2019-06-21T02:36:14.956Z","updatedAt":"2019-06-21T02:36:14.957Z","id":1,"config":{"hello":"test"},"version":1,"revision":1,"createdBy":40051333,"updatedBy":40051333,"key":"dev","deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.form.version/project.notification.delete.json b/test/data/project.form.version/project.notification.delete.json
deleted file mode 100644
index 97e8baa..0000000
--- a/test/data/project.form.version/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-21T02:36:57.757Z","mime-type":"application/json","payload":{"resource":"project.form.version","id":1}}
\ No newline at end of file
diff --git a/test/data/project.form.version/project.notification.update.json b/test/data/project.form.version/project.notification.update.json
deleted file mode 100644
index ec81c51..0000000
--- a/test/data/project.form.version/project.notification.update.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.update","originator":"project-api","timestamp":"2019-06-21T02:36:34.611Z","mime-type":"application/json","payload":{"resource":"project.form.version","createdAt":"2019-06-21T02:36:34.574Z","updatedAt":"2019-06-21T02:36:34.574Z","id":1,"version":1,"revision":2,"createdBy":40051333,"updatedBy":40051333,"key":"dev","config":{"hello":"test111"},"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.member.invite/project.action.create.json b/test/data/project.member.invite/project.action.create.json
new file mode 100644
index 0000000..b071d6c
--- /dev/null
+++ b/test/data/project.member.invite/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:58:12.671Z","mime-type":"application/json","payload":{"resource":"project.member.invite","createdAt":"2019-06-21T04:58:12.594Z","updatedAt":"2019-06-21T04:58:12.594Z","id":1,"projectId":1,"role":"customer","status":"pending","createdBy":40051334,"updatedBy":40051334,"userId":40051331,"email":null,"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.member.invite/project.action.update.json b/test/data/project.member.invite/project.action.update.json
new file mode 100644
index 0000000..36e1188
--- /dev/null
+++ b/test/data/project.member.invite/project.action.update.json
@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T04:59:38.562Z","mime-type":"application/json","payload":{"resource":"project.member.invite","status":"pending","userId":40051331,"email":"test@topcoder.com","id":1,"projectId":1}}
\ No newline at end of file
diff --git a/test/data/project.member.invite/project.notification.create.json b/test/data/project.member.invite/project.notification.create.json
deleted file mode 100644
index 91be44d..0000000
--- a/test/data/project.member.invite/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-21T04:58:12.671Z","mime-type":"application/json","payload":{"resource":"project.member.invite","createdAt":"2019-06-21T04:58:12.594Z","updatedAt":"2019-06-21T04:58:12.594Z","id":1,"projectId":1,"role":"customer","status":"pending","createdBy":40051334,"updatedBy":40051334,"userId":40051331,"email":null,"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.member.invite/project.notification.update.json b/test/data/project.member.invite/project.notification.update.json
deleted file mode 100644
index 3f41585..0000000
--- a/test/data/project.member.invite/project.notification.update.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.update","originator":"project-api","timestamp":"2019-06-21T04:59:38.562Z","mime-type":"application/json","payload":{"resource":"project.member.invite","status":"pending","userId":40051331,"email":"test@topcoder.com","id":1,"projectId":1}}
\ No newline at end of file
diff --git a/test/data/project.member/project.action.create.json b/test/data/project.member/project.action.create.json
new file mode 100644
index 0000000..58fa0f5
--- /dev/null
+++ b/test/data/project.member/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:45:18.165Z","mime-type":"application/json","payload":{"resource":"project.member","createdAt":"2019-06-21T04:45:18.036Z","updatedAt":"2019-06-21T04:45:18.038Z","isPrimary":false,"id":1,"projectId":1,"role":"manager","userId":40051334,"createdBy":40051334,"updatedBy":40051334,"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.member/project.action.delete.json b/test/data/project.member/project.action.delete.json
new file mode 100644
index 0000000..ff45c02
--- /dev/null
+++ b/test/data/project.member/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-21T04:45:56.977Z","mime-type":"application/json","payload":{"resource":"project.member","id":1,"projectId":1}}
\ No newline at end of file
diff --git a/test/data/project.member/project.action.update.json b/test/data/project.member/project.action.update.json
new file mode 100644
index 0000000..a2e4143
--- /dev/null
+++ b/test/data/project.member/project.action.update.json
@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T04:45:39.828Z","mime-type":"application/json","payload":{"resource":"project.member","isPrimary":true,"role":"copilot","id":1,"projectId":1}}
\ No newline at end of file
diff --git a/test/data/project.member/project.notification.create.json b/test/data/project.member/project.notification.create.json
deleted file mode 100644
index 8f7c06a..0000000
--- a/test/data/project.member/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-21T04:45:18.165Z","mime-type":"application/json","payload":{"resource":"project.member","createdAt":"2019-06-21T04:45:18.036Z","updatedAt":"2019-06-21T04:45:18.038Z","isPrimary":false,"id":1,"projectId":1,"role":"manager","userId":40051334,"createdBy":40051334,"updatedBy":40051334,"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.member/project.notification.delete.json b/test/data/project.member/project.notification.delete.json
deleted file mode 100644
index 5bae538..0000000
--- a/test/data/project.member/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-21T04:45:56.977Z","mime-type":"application/json","payload":{"resource":"project.member","id":1,"projectId":1}}
\ No newline at end of file
diff --git a/test/data/project.member/project.notification.update.json b/test/data/project.member/project.notification.update.json
deleted file mode 100644
index a5ef6e6..0000000
--- a/test/data/project.member/project.notification.update.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.update","originator":"project-api","timestamp":"2019-06-21T04:45:39.828Z","mime-type":"application/json","payload":{"resource":"project.member","isPrimary":true,"role":"copilot","id":1,"projectId":1}}
\ No newline at end of file
diff --git a/test/data/project.orgConfig/project.action.create.json b/test/data/project.orgConfig/project.action.create.json
new file mode 100644
index 0000000..46f0844
--- /dev/null
+++ b/test/data/project.orgConfig/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T06:42:46.553Z","mime-type":"application/json","payload":{"resource":"project.orgConfig","createdAt":"2019-06-21T06:42:46.512Z","updatedAt":"2019-06-21T06:42:46.512Z","id":1,"orgId":"ORG2","configName":"project_catefory_url","configValue":"http://localhost/url","createdBy":40051333,"updatedBy":40051333,"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.orgConfig/project.action.delete.json b/test/data/project.orgConfig/project.action.delete.json
new file mode 100644
index 0000000..8c41492
--- /dev/null
+++ b/test/data/project.orgConfig/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-21T06:48:55.584Z","mime-type":"application/json","payload":{"resource":"project.orgConfig","id":1}}
\ No newline at end of file
diff --git a/test/data/project.orgConfig/project.action.update.json b/test/data/project.orgConfig/project.action.update.json
new file mode 100644
index 0000000..2b0936d
--- /dev/null
+++ b/test/data/project.orgConfig/project.action.update.json
@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T06:48:01.256Z","mime-type":"application/json","payload":{"resource":"project.orgConfig","id":1,"orgId":"ORG2","configName":"project_category_url_update","configValue":"/projects/1","updatedBy":40051333}}
\ No newline at end of file
diff --git a/test/data/project.orgConfig/project.notification.create.json b/test/data/project.orgConfig/project.notification.create.json
deleted file mode 100644
index 118013f..0000000
--- a/test/data/project.orgConfig/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-21T06:42:46.553Z","mime-type":"application/json","payload":{"resource":"project.orgConfig","createdAt":"2019-06-21T06:42:46.512Z","updatedAt":"2019-06-21T06:42:46.512Z","id":1,"orgId":"ORG2","configName":"project_catefory_url","configValue":"http://localhost/url","createdBy":40051333,"updatedBy":40051333,"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.orgConfig/project.notification.delete.json b/test/data/project.orgConfig/project.notification.delete.json
deleted file mode 100644
index 797a542..0000000
--- a/test/data/project.orgConfig/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-21T06:48:55.584Z","mime-type":"application/json","payload":{"resource":"project.orgConfig","id":1}}
\ No newline at end of file
diff --git a/test/data/project.orgConfig/project.notification.update.json b/test/data/project.orgConfig/project.notification.update.json
deleted file mode 100644
index 19ca1a9..0000000
--- a/test/data/project.orgConfig/project.notification.update.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.update","originator":"project-api","timestamp":"2019-06-21T06:48:01.256Z","mime-type":"application/json","payload":{"resource":"project.orgConfig","id":1,"orgId":"ORG2","configName":"project_category_url_update","configValue":"/projects/1","updatedBy":40051333}}
\ No newline at end of file
diff --git a/test/data/project.planConfig.revision/project.action.create.json b/test/data/project.planConfig.revision/project.action.create.json
new file mode 100644
index 0000000..8afef3b
--- /dev/null
+++ b/test/data/project.planConfig.revision/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:30:26.888Z","mime-type":"application/json","payload":{"resource":"project.planConfig.revision","createdAt":"2019-06-21T04:30:26.849Z","updatedAt":"2019-06-21T04:30:26.850Z","id":2,"config":{"hello":"test"},"version":1,"revision":2,"createdBy":40051333,"updatedBy":40051333,"key":"dev","deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.planConfig.revision/project.action.delete.json b/test/data/project.planConfig.revision/project.action.delete.json
new file mode 100644
index 0000000..ccd3b35
--- /dev/null
+++ b/test/data/project.planConfig.revision/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-21T04:30:38.056Z","mime-type":"application/json","payload":{"resource":"project.planConfig.revision","id":2}}
\ No newline at end of file
diff --git a/test/data/project.planConfig.revision/project.notification.create.json b/test/data/project.planConfig.revision/project.notification.create.json
deleted file mode 100644
index 9ad5e62..0000000
--- a/test/data/project.planConfig.revision/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-21T04:30:26.888Z","mime-type":"application/json","payload":{"resource":"project.planConfig.revision","createdAt":"2019-06-21T04:30:26.849Z","updatedAt":"2019-06-21T04:30:26.850Z","id":2,"config":{"hello":"test"},"version":1,"revision":2,"createdBy":40051333,"updatedBy":40051333,"key":"dev","deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.planConfig.revision/project.notification.delete.json b/test/data/project.planConfig.revision/project.notification.delete.json
deleted file mode 100644
index 42457ed..0000000
--- a/test/data/project.planConfig.revision/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-21T04:30:38.056Z","mime-type":"application/json","payload":{"resource":"project.planConfig.revision","id":2}}
\ No newline at end of file
diff --git a/test/data/project.planConfig.version/project.action.create.json b/test/data/project.planConfig.version/project.action.create.json
new file mode 100644
index 0000000..0d710a8
--- /dev/null
+++ b/test/data/project.planConfig.version/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:28:29.906Z","mime-type":"application/json","payload":{"resource":"project.planConfig.version","createdAt":"2019-06-21T04:28:29.859Z","updatedAt":"2019-06-21T04:28:29.859Z","id":1,"config":{"hello":"test"},"version":1,"revision":1,"createdBy":40051333,"updatedBy":40051333,"key":"dev","deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.planConfig.version/project.action.delete.json b/test/data/project.planConfig.version/project.action.delete.json
new file mode 100644
index 0000000..604a49c
--- /dev/null
+++ b/test/data/project.planConfig.version/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-21T04:30:55.304Z","mime-type":"application/json","payload":{"resource":"project.planConfig.version","id":1}}
\ No newline at end of file
diff --git a/test/data/project.planConfig.version/project.action.update.json b/test/data/project.planConfig.version/project.action.update.json
new file mode 100644
index 0000000..d3a0e6d
--- /dev/null
+++ b/test/data/project.planConfig.version/project.action.update.json
@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T04:29:43.503Z","mime-type":"application/json","payload":{"resource":"project.planConfig.version","createdAt":"2019-06-21T04:29:43.460Z","updatedAt":"2019-06-21T04:29:43.461Z","id":1,"version":1,"revision":3,"createdBy":40051333,"updatedBy":40051333,"key":"dev","config":{"hello":"test111"},"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.planConfig.version/project.notification.create.json b/test/data/project.planConfig.version/project.notification.create.json
deleted file mode 100644
index ad97954..0000000
--- a/test/data/project.planConfig.version/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-21T04:28:29.906Z","mime-type":"application/json","payload":{"resource":"project.planConfig.version","createdAt":"2019-06-21T04:28:29.859Z","updatedAt":"2019-06-21T04:28:29.859Z","id":1,"config":{"hello":"test"},"version":1,"revision":1,"createdBy":40051333,"updatedBy":40051333,"key":"dev","deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.planConfig.version/project.notification.delete.json b/test/data/project.planConfig.version/project.notification.delete.json
deleted file mode 100644
index e8301fd..0000000
--- a/test/data/project.planConfig.version/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-21T04:30:55.304Z","mime-type":"application/json","payload":{"resource":"project.planConfig.version","id":1}}
\ No newline at end of file
diff --git a/test/data/project.planConfig.version/project.notification.update.json b/test/data/project.planConfig.version/project.notification.update.json
deleted file mode 100644
index 67a2749..0000000
--- a/test/data/project.planConfig.version/project.notification.update.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.update","originator":"project-api","timestamp":"2019-06-21T04:29:43.503Z","mime-type":"application/json","payload":{"resource":"project.planConfig.version","createdAt":"2019-06-21T04:29:43.460Z","updatedAt":"2019-06-21T04:29:43.461Z","id":1,"version":1,"revision":3,"createdBy":40051333,"updatedBy":40051333,"key":"dev","config":{"hello":"test111"},"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.priceConfig.revision/project.action.create.json b/test/data/project.priceConfig.revision/project.action.create.json
new file mode 100644
index 0000000..3ce0ff7
--- /dev/null
+++ b/test/data/project.priceConfig.revision/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:26:38.757Z","mime-type":"application/json","payload":{"resource":"project.priceConfig.revision","createdAt":"2019-06-21T04:26:38.687Z","updatedAt":"2019-06-21T04:26:38.687Z","id":2,"config":{"hello":"test"},"version":1,"revision":2,"createdBy":40051333,"updatedBy":40051333,"key":"dev","deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.priceConfig.revision/project.action.delete.json b/test/data/project.priceConfig.revision/project.action.delete.json
new file mode 100644
index 0000000..90952f2
--- /dev/null
+++ b/test/data/project.priceConfig.revision/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-21T04:27:20.753Z","mime-type":"application/json","payload":{"resource":"project.priceConfig.revision","id":2}}
\ No newline at end of file
diff --git a/test/data/project.priceConfig.revision/project.notification.create.json b/test/data/project.priceConfig.revision/project.notification.create.json
deleted file mode 100644
index b5ff355..0000000
--- a/test/data/project.priceConfig.revision/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-21T04:26:38.757Z","mime-type":"application/json","payload":{"resource":"project.priceConfig.revision","createdAt":"2019-06-21T04:26:38.687Z","updatedAt":"2019-06-21T04:26:38.687Z","id":2,"config":{"hello":"test"},"version":1,"revision":2,"createdBy":40051333,"updatedBy":40051333,"key":"dev","deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.priceConfig.revision/project.notification.delete.json b/test/data/project.priceConfig.revision/project.notification.delete.json
deleted file mode 100644
index 636feca..0000000
--- a/test/data/project.priceConfig.revision/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-21T04:27:20.753Z","mime-type":"application/json","payload":{"resource":"project.priceConfig.revision","id":2}}
\ No newline at end of file
diff --git a/test/data/project.priceConfig.version/project.action.create.json b/test/data/project.priceConfig.version/project.action.create.json
new file mode 100644
index 0000000..63cc13b
--- /dev/null
+++ b/test/data/project.priceConfig.version/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:25:36.881Z","mime-type":"application/json","payload":{"resource":"project.priceConfig.version","createdAt":"2019-06-21T04:25:36.847Z","updatedAt":"2019-06-21T04:25:36.847Z","id":1,"config":{"hello":"test"},"version":1,"revision":1,"createdBy":40051333,"updatedBy":40051333,"key":"dev","deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.priceConfig.version/project.action.delete.json b/test/data/project.priceConfig.version/project.action.delete.json
new file mode 100644
index 0000000..93a1846
--- /dev/null
+++ b/test/data/project.priceConfig.version/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-21T04:27:41.198Z","mime-type":"application/json","payload":{"resource":"project.priceConfig.version","id":1}}
\ No newline at end of file
diff --git a/test/data/project.priceConfig.version/project.action.update.json b/test/data/project.priceConfig.version/project.action.update.json
new file mode 100644
index 0000000..3e47fc5
--- /dev/null
+++ b/test/data/project.priceConfig.version/project.action.update.json
@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T04:26:02.907Z","mime-type":"application/json","payload":{"resource":"project.priceConfig.version","createdAt":"2019-06-21T04:26:02.875Z","updatedAt":"2019-06-21T04:26:02.875Z","id":1,"version":1,"revision":1,"createdBy":40051333,"updatedBy":40051333,"key":"dev","config":{"hello":"test111"},"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.priceConfig.version/project.notification.create.json b/test/data/project.priceConfig.version/project.notification.create.json
deleted file mode 100644
index 453cd86..0000000
--- a/test/data/project.priceConfig.version/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-21T04:25:36.881Z","mime-type":"application/json","payload":{"resource":"project.priceConfig.version","createdAt":"2019-06-21T04:25:36.847Z","updatedAt":"2019-06-21T04:25:36.847Z","id":1,"config":{"hello":"test"},"version":1,"revision":1,"createdBy":40051333,"updatedBy":40051333,"key":"dev","deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.priceConfig.version/project.notification.delete.json b/test/data/project.priceConfig.version/project.notification.delete.json
deleted file mode 100644
index 79e433e..0000000
--- a/test/data/project.priceConfig.version/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-21T04:27:41.198Z","mime-type":"application/json","payload":{"resource":"project.priceConfig.version","id":1}}
\ No newline at end of file
diff --git a/test/data/project.priceConfig.version/project.notification.update.json b/test/data/project.priceConfig.version/project.notification.update.json
deleted file mode 100644
index a0c7ad5..0000000
--- a/test/data/project.priceConfig.version/project.notification.update.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.update","originator":"project-api","timestamp":"2019-06-21T04:26:02.907Z","mime-type":"application/json","payload":{"resource":"project.priceConfig.version","createdAt":"2019-06-21T04:26:02.875Z","updatedAt":"2019-06-21T04:26:02.875Z","id":1,"version":1,"revision":1,"createdBy":40051333,"updatedBy":40051333,"key":"dev","config":{"hello":"test111"},"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.template/project.action.create.json b/test/data/project.template/project.action.create.json
new file mode 100644
index 0000000..aa1cfc1
--- /dev/null
+++ b/test/data/project.template/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T02:00:27.369Z","mime-type":"application/json","payload":{"resource":"project.template","createdAt":"2019-06-21T02:00:27.263Z","updatedAt":"2019-06-21T02:00:27.264Z","disabled":false,"hidden":false,"id":1,"name":"new name","key":"new key 2","category":"app","icon":"http://example.com/icon1.ico","question":"question 1","info":"info 1","aliases":["key-1","key_1"],"scope":{"scope1":"scope 1"},"phases":{"phase1":"phase 1"},"createdBy":40051333,"updatedBy":40051333,"form":null,"planConfig":null,"priceConfig":null,"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.template/project.action.delete.json b/test/data/project.template/project.action.delete.json
new file mode 100644
index 0000000..072de24
--- /dev/null
+++ b/test/data/project.template/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-21T02:02:15.628Z","mime-type":"application/json","payload":{"resource":"project.template","id":1}}
\ No newline at end of file
diff --git a/test/data/project.template/project.action.update.json b/test/data/project.template/project.action.update.json
new file mode 100644
index 0000000..4da97c7
--- /dev/null
+++ b/test/data/project.template/project.action.update.json
@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T02:01:34.484Z","mime-type":"application/json","payload":{"resource":"project.template","id": 1,"name":"new name updated","key":"new key updated","category":"app","scope":{"scope1":"scope 1","scope2":["a"]},"phases":{"phase1":"phase 1","phase2":{"another":"another"}},"updatedBy":40051333}}
\ No newline at end of file
diff --git a/test/data/project.template/project.notification.create.json b/test/data/project.template/project.notification.create.json
deleted file mode 100644
index 4de2559..0000000
--- a/test/data/project.template/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-21T02:00:27.369Z","mime-type":"application/json","payload":{"resource":"project.template","createdAt":"2019-06-21T02:00:27.263Z","updatedAt":"2019-06-21T02:00:27.264Z","disabled":false,"hidden":false,"id":1,"name":"new name","key":"new key 2","category":"app","icon":"http://example.com/icon1.ico","question":"question 1","info":"info 1","aliases":["key-1","key_1"],"scope":{"scope1":"scope 1"},"phases":{"phase1":"phase 1"},"createdBy":40051333,"updatedBy":40051333,"form":null,"planConfig":null,"priceConfig":null,"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.template/project.notification.delete.json b/test/data/project.template/project.notification.delete.json
deleted file mode 100644
index fa98668..0000000
--- a/test/data/project.template/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-21T02:02:15.628Z","mime-type":"application/json","payload":{"resource":"project.template","id":1}}
\ No newline at end of file
diff --git a/test/data/project.template/project.notification.update.json b/test/data/project.template/project.notification.update.json
deleted file mode 100644
index 075196f..0000000
--- a/test/data/project.template/project.notification.update.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.update","originator":"project-api","timestamp":"2019-06-21T02:01:34.484Z","mime-type":"application/json","payload":{"resource":"project.template","id": 1,"name":"new name updated","key":"new key updated","category":"app","scope":{"scope1":"scope 1","scope2":["a"]},"phases":{"phase1":"phase 1","phase2":{"another":"another"}},"updatedBy":40051333}}
\ No newline at end of file
diff --git a/test/data/project.type/project.action.create.json b/test/data/project.type/project.action.create.json
new file mode 100644
index 0000000..05909be
--- /dev/null
+++ b/test/data/project.type/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T02:13:37.666Z","mime-type":"application/json","payload":{"resource":"project.type","createdAt":"2019-06-21T02:13:37.620Z","updatedAt":"2019-06-21T02:13:37.620Z","disabled":false,"hidden":false,"id": 1,"key":"new key","displayName":"new displayName","icon":"http://example.com/icon4.ico","question":"question 4","info":"info 4","aliases":["key-41","key_42"],"metadata":{},"createdBy":40051333,"updatedBy":40051333,"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.type/project.action.delete.json b/test/data/project.type/project.action.delete.json
new file mode 100644
index 0000000..16339d0
--- /dev/null
+++ b/test/data/project.type/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-21T02:14:38.888Z","mime-type":"application/json","payload":{"resource":"project.type","key":"new key"}}
\ No newline at end of file
diff --git a/test/data/project.type/project.action.update.json b/test/data/project.type/project.action.update.json
new file mode 100644
index 0000000..c6b514a
--- /dev/null
+++ b/test/data/project.type/project.action.update.json
@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T02:14:23.644Z","mime-type":"application/json","payload":{"resource":"project.type","displayName":"Chatbot-updated","updatedBy":40051333,"key":"new key"}}
\ No newline at end of file
diff --git a/test/data/project.type/project.notification.create.json b/test/data/project.type/project.notification.create.json
deleted file mode 100644
index a42a9bb..0000000
--- a/test/data/project.type/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-21T02:13:37.666Z","mime-type":"application/json","payload":{"resource":"project.type","createdAt":"2019-06-21T02:13:37.620Z","updatedAt":"2019-06-21T02:13:37.620Z","disabled":false,"hidden":false,"id": 1,"key":"new key","displayName":"new displayName","icon":"http://example.com/icon4.ico","question":"question 4","info":"info 4","aliases":["key-41","key_42"],"metadata":{},"createdBy":40051333,"updatedBy":40051333,"deletedAt":null,"deletedBy":null}}
\ No newline at end of file
diff --git a/test/data/project.type/project.notification.delete.json b/test/data/project.type/project.notification.delete.json
deleted file mode 100644
index 5faba9c..0000000
--- a/test/data/project.type/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-21T02:14:38.888Z","mime-type":"application/json","payload":{"resource":"project.type","key":"new key"}}
\ No newline at end of file
diff --git a/test/data/project.type/project.notification.update.json b/test/data/project.type/project.notification.update.json
deleted file mode 100644
index 3107dea..0000000
--- a/test/data/project.type/project.notification.update.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.update","originator":"project-api","timestamp":"2019-06-21T02:14:23.644Z","mime-type":"application/json","payload":{"resource":"project.type","displayName":"Chatbot-updated","updatedBy":40051333,"key":"new key"}}
\ No newline at end of file
diff --git a/test/data/project/project.action.create.json b/test/data/project/project.action.create.json
new file mode 100644
index 0000000..ec24633
--- /dev/null
+++ b/test/data/project/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-20T13:43:25.817Z","mime-type":"application/json","payload":{"resource":"project","createdAt":"2019-06-20T13:43:23.554Z","updatedAt":"2019-06-20T13:43:23.555Z","terms":[],"order":1,"id":1,"name":"test project","description":"Hello I am a test project","type":"app","createdBy":40051333,"updatedBy":40051333,"challengeEligibility":[],"bookmarks":[],"external":null,"status":"draft","lastActivityAt":"2019-06-20T13:43:23.514Z","lastActivityUserId":"40051333","members":[{"createdAt":"2019-06-20T13:43:23.555Z","updatedAt":"2019-06-20T13:43:23.625Z","id":2,"isPrimary":true,"role":"manager","userId":40051333,"updatedBy":40051333,"createdBy":40051333,"projectId":2,"deletedAt":null,"deletedBy":null}],"version":"v2","directProjectId":null,"billingAccountId":null,"estimatedPrice":null,"actualPrice":null,"details":null,"cancelReason":null,"templateId":null,"deletedBy":null,"attachments":null,"phases":null,"projectUrl":"https://connect.topcoder-dev.com/projects/2"}}
\ No newline at end of file
diff --git a/test/data/project/project.action.delete.json b/test/data/project/project.action.delete.json
new file mode 100644
index 0000000..f56397f
--- /dev/null
+++ b/test/data/project/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-20T13:45:53.707Z","mime-type":"application/json","payload":{"resource":"project","id":1}}
\ No newline at end of file
diff --git a/test/data/project/project.action.update.json b/test/data/project/project.action.update.json
new file mode 100644
index 0000000..b0377fb
--- /dev/null
+++ b/test/data/project/project.action.update.json
@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-20T13:45:20.179Z","mime-type":"application/json","payload":{"resource":"project","id":1,"directProjectId":12,"billingAccountId":null,"name":"project name updated","description":"Hello I am a test project","external":null,"bookmarks":[],"utm":null,"estimatedPrice":null,"actualPrice":null,"terms":[],"type":"app","status":"draft","details":null,"challengeEligibility":[],"cancelReason":null,"templateId":null,"createdAt":"2019-06-20T13:43:23.554Z","updatedAt":"2019-06-20T13:45:20.091Z","deletedBy":null,"createdBy":40051333,"updatedBy":40051333,"version":"v2","lastActivityAt":"2019-06-20T13:43:23.514Z","lastActivityUserId":"40051333","projectUrl":"https://connect.topcoder-dev.com/projects/2"}}
\ No newline at end of file
diff --git a/test/data/project/project.notification.create.json b/test/data/project/project.notification.create.json
deleted file mode 100644
index 57ed4b4..0000000
--- a/test/data/project/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-20T13:43:25.817Z","mime-type":"application/json","payload":{"resource":"project","createdAt":"2019-06-20T13:43:23.554Z","updatedAt":"2019-06-20T13:43:23.555Z","terms":[],"order":1,"id":1,"name":"test project","description":"Hello I am a test project","type":"app","createdBy":40051333,"updatedBy":40051333,"challengeEligibility":[],"bookmarks":[],"external":null,"status":"draft","lastActivityAt":"2019-06-20T13:43:23.514Z","lastActivityUserId":"40051333","members":[{"createdAt":"2019-06-20T13:43:23.555Z","updatedAt":"2019-06-20T13:43:23.625Z","id":2,"isPrimary":true,"role":"manager","userId":40051333,"updatedBy":40051333,"createdBy":40051333,"projectId":2,"deletedAt":null,"deletedBy":null}],"version":"v2","directProjectId":null,"billingAccountId":null,"estimatedPrice":null,"actualPrice":null,"details":null,"cancelReason":null,"templateId":null,"deletedBy":null,"attachments":null,"phases":null,"projectUrl":"https://connect.topcoder-dev.com/projects/2"}}
\ No newline at end of file
diff --git a/test/data/project/project.notification.delete.json b/test/data/project/project.notification.delete.json
deleted file mode 100644
index bb7a267..0000000
--- a/test/data/project/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-20T13:45:53.707Z","mime-type":"application/json","payload":{"resource":"project","id":1}}
\ No newline at end of file
diff --git a/test/data/project/project.notification.update.json b/test/data/project/project.notification.update.json
deleted file mode 100644
index 89b3909..0000000
--- a/test/data/project/project.notification.update.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.update","originator":"project-api","timestamp":"2019-06-20T13:45:20.179Z","mime-type":"application/json","payload":{"resource":"project","id":1,"directProjectId":12,"billingAccountId":null,"name":"project name updated","description":"Hello I am a test project","external":null,"bookmarks":[],"utm":null,"estimatedPrice":null,"actualPrice":null,"terms":[],"type":"app","status":"draft","details":null,"challengeEligibility":[],"cancelReason":null,"templateId":null,"createdAt":"2019-06-20T13:43:23.554Z","updatedAt":"2019-06-20T13:45:20.091Z","deletedBy":null,"createdBy":40051333,"updatedBy":40051333,"version":"v2","lastActivityAt":"2019-06-20T13:43:23.514Z","lastActivityUserId":"40051333","projectUrl":"https://connect.topcoder-dev.com/projects/2"}}
\ No newline at end of file
diff --git a/test/data/timeline/project.action.create.json b/test/data/timeline/project.action.create.json
new file mode 100644
index 0000000..944fdbf
--- /dev/null
+++ b/test/data/timeline/project.action.create.json
@@ -0,0 +1 @@
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:49:43.786Z","mime-type":"application/json","payload":{"resource":"timeline","createdAt":"2019-06-21T04:49:43.702Z","updatedAt":"2019-06-21T04:49:43.703Z","id":1,"name":"new name","description":"new description","startDate":"2018-05-29T00:00:00.000Z","endDate":"2018-05-30T00:00:00.000Z","reference":"project","referenceId":1,"createdBy":40051336,"updatedBy":40051336}}
\ No newline at end of file
diff --git a/test/data/timeline/project.action.delete.json b/test/data/timeline/project.action.delete.json
new file mode 100644
index 0000000..b7c6b69
--- /dev/null
+++ b/test/data/timeline/project.action.delete.json
@@ -0,0 +1 @@
+{"topic":"project.action.delete","originator":"project-api","timestamp":"2019-06-21T04:50:19.048Z","mime-type":"application/json","payload":{"resource":"timeline","id":1}}
\ No newline at end of file
diff --git a/test/data/timeline/project.action.update.json b/test/data/timeline/project.action.update.json
new file mode 100644
index 0000000..4aba24e
--- /dev/null
+++ b/test/data/timeline/project.action.update.json
@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T04:50:04.311Z","mime-type":"application/json","payload":{"resource":"timeline","name":"timeline 1-updated","description":"description-updated","startDate":"2018-05-01T00:00:00.000Z","endDate":null,"reference":"project","referenceId":4,"updatedBy":40051333,"id":1}}
\ No newline at end of file
diff --git a/test/data/timeline/project.notification.create.json b/test/data/timeline/project.notification.create.json
deleted file mode 100644
index 7a179c4..0000000
--- a/test/data/timeline/project.notification.create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.create","originator":"project-api","timestamp":"2019-06-21T04:49:43.786Z","mime-type":"application/json","payload":{"resource":"timeline","createdAt":"2019-06-21T04:49:43.702Z","updatedAt":"2019-06-21T04:49:43.703Z","id":1,"name":"new name","description":"new description","startDate":"2018-05-29T00:00:00.000Z","endDate":"2018-05-30T00:00:00.000Z","reference":"project","referenceId":1,"createdBy":40051336,"updatedBy":40051336}}
\ No newline at end of file
diff --git a/test/data/timeline/project.notification.delete.json b/test/data/timeline/project.notification.delete.json
deleted file mode 100644
index 233cdb6..0000000
--- a/test/data/timeline/project.notification.delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.delete","originator":"project-api","timestamp":"2019-06-21T04:50:19.048Z","mime-type":"application/json","payload":{"resource":"timeline","id":1}}
\ No newline at end of file
diff --git a/test/data/timeline/project.notification.update.json b/test/data/timeline/project.notification.update.json
deleted file mode 100644
index 78a2945..0000000
--- a/test/data/timeline/project.notification.update.json
+++ /dev/null
@@ -1 +0,0 @@
-{"topic":"project.notification.update","originator":"project-api","timestamp":"2019-06-21T04:50:04.311Z","mime-type":"application/json","payload":{"resource":"timeline","name":"timeline 1-updated","description":"description-updated","startDate":"2018-05-01T00:00:00.000Z","endDate":null,"reference":"project","referenceId":4,"updatedBy":40051333,"id":1}}
\ No newline at end of file