Implemented constant based event names. Updated tests and also added new ones.