Improve handling on NoInput test cases Change-Id: Ia2ceb07c42aa6b73ffa6d6e96ef1b3464e586e3a Signed-off-by: Eugene Mutavchi <Ievgen_Mutavchi@comcast.com>