* [MM-39491] Force Add Server modal to stay until server has been added * Make the parameter optional * Actually do the logic, add a test for the logic * Add remove event listener
* [MM-40144] Restructure tests, add test case numbers, some cleanup * Fix a test