Removed old specs and added EventHandler spec