add test cases for optional guests cases, adjusted code to handle opt…#30

cli1903 wants to merge 1 commit intotestingcli1903/step:testingfrom

optionalcli1903/step:optionalCopy head branch name to clipboard