Simplify CrudComponent::addListener

Add improve general test coverage