Modify to pass tests on windows

Resolves: https://www.pivotaltracker.com/story/show/72660156
Add one-click functionality

Resolves: https://www.pivotaltracker.com/story/show/72498038