fixed specs, updated event handler spec