Adding in api prefix constant
Fixing test
Adding in event type seperator
Using typed identifier for removing duplicate items