Refactored test code for events controller
Refactored the test headers