Added test class, changes to EventCell