Cleaned up unit tests
Updates the eventHandler to account for when no display template is
found.