Fix cloud discovery test (form buttons)
   Also clean up imports