fix test issues after product change
add id for a button for testability
revert change
Merge pull request #2208 from NuGet/danliu/tests

Fix functional test issues