Fix cloud discovery test (form buttons)

   Also clean up imports

tested cloud discovery both upstream and downstream
```python
FormButton("Start the Host Discovery")
```

Does not work here?