BS-2064
Remove mandatory option
Add new conector outputs
Update Test suite