Better handling for unknown commands
Update expected response for unknown commands