Cleaning up Scala code... Failing tests! Added name property to EventManagers