fixes to make subnet ui tests green
Merge pull request #448 from sthirugn/test1

Fixes to make subnet ui tests green