Replaced CommandListener by CommandExecutionListener
Fixed failing test