Fix + two tests#52

maxhq wants to merge 2 commits into

whiterabbitsecurity:masterwhiterabbitsecurity/connector:masterfrom

maxhq:mastermaxhq/connector:masterCopy head branch name to clipboard