Message handling always returns json (if it's a plain text message, convert it to {'message': <message>}
Added more tests