Refactor FTU tests to use click (where possible)
Merge pull request #612 from zacc/issue_610

Refactor FTU tests to use click (where possible)