Merge "Move admin "delete a server" tests to test_servers"