Working on tests for Switch. Changing over Event to new mango packages