Fix cloud discovery test (form buttons)

   Also clean up imports

tested cloud discovery both upstream and downstream