@@ -63,12 +63,11 @@ def set_client(self, client=None, use_dask=True, **kwargs):
             self._using_dask = False
 
 
-    def compute(self, value, sync=True):
+    def compute(self, value):
         """Get the actual value
         
         :param value:
-        :param sync: Operate synchronously
-        :return: If sync=True then the value, otherwise a Future
+        :return: If not using dask then the value, otherwise a Future
         """
         if self._using_dask:
             start = time.time()
 
@@ -375,7 +375,7 @@
     "corrupted_vis = arlexecute.client.scatter(corrupted_vis)\n",
     "graph = create_skymodel_cal_solve_graph(corrupted_vis, calskymodel_graph, niter=30, \n",
     "                                        gain=0.25, tol=1e-8)\n",
-    "calskymodel, residual_vis = arlexecute.compute(graph)"
+    "calskymodel, residual_vis = arlexecute.compute(graph).result()"
    ]
   },
   {
 
@@ -116,7 +116,7 @@ def test_deconvolve_spectral(self):
                                         dopsf=True, normalize=True)
         deconvolved, _ = create_deconvolve_graph(dirty_graph, psf_graph, self.model_graph, niter=1000,
                                                  fractional_threshold=0.1, scales=[0, 3, 10],
-                                                 threshold=0.1, nmajor=0, gain=0.7)
+                                                 threshold=0.1, gain=0.7)
         deconvolved = arlexecute.compute(deconvolved)
 
         export_image_to_fits(deconvolved[0], '%s/test_imaging_%s_deconvolve_spectral.fits' %
@@ -131,7 +131,7 @@ def test_deconvolve_and_restore_cube_mmclean(self):
         dec_graph, _ = create_deconvolve_graph(dirty_graph, psf_graph, self.model_graph, niter=1000,
                                                fractional_threshold=0.1, scales=[0, 3, 10],
                                                algorithm='mmclean', nmoments=3, nchan=self.freqwin,
-                                               threshold=0.1, nmajor=0, gain=0.7)
+                                               threshold=0.1, gain=0.7)
         residual_graph = create_residual_graph(self.vis_graph_list, model_graph=dec_graph,
                                                context='wstack', vis_slices=51)
         restored = create_restore_graph(model_graph=dec_graph, psf_graph=psf_graph, residual_graph=residual_graph,
@@ -150,8 +150,8 @@ def test_deconvolve_and_restore_cube_mmclean_facets(self):
         dec_graph, _ = create_deconvolve_graph(dirty_graph, psf_graph, self.model_graph, niter=1000,
                                                fractional_threshold=0.1, scales=[0, 3, 10],
                                                algorithm='mmclean', nmoments=3, nchan=self.freqwin,
-                                               threshold=0.1, nmajor=0, gain=0.7, deconvolve_facets=4,
-                                               deconvolve_overlap=16)
+                                               threshold=0.1, gain=0.7, deconvolve_facets=4,
+                                               deconvolve_overlap=16, deconvolve_taper='tukey')
         residual_graph = create_residual_graph(self.vis_graph_list, model_graph=dec_graph,
                                                context='2d')
         restored = create_restore_graph(model_graph=dec_graph, psf_graph=psf_graph, residual_graph=residual_graph,
 
@@ -67,21 +67,14 @@ def test_get_frequency_map_mfs(self):
 
     def test_get_frequency_map_gleam(self):
         self.model = create_low_test_image_from_gleam(npixel=512, cellsize=0.001, frequency=self.frequency,
-                                                      channel_bandwidth=self.channel_bandwidth)
-        spectral_mode, vfrequency_map = get_frequency_map(self.vis, self.model)
-        assert numpy.max(vfrequency_map) == self.model.nchan - 1
-        assert spectral_mode == 'channel'
-
-    def test_get_frequency_map_s3(self):
-        self.model = create_test_image_from_s3(npixel=64, cellsize=0.001, frequency=self.frequency,
-                                               channel_bandwidth=self.channel_bandwidth)
+                                                      channel_bandwidth=self.channel_bandwidth, flux_limit=10.0)
         spectral_mode, vfrequency_map = get_frequency_map(self.vis, self.model)
         assert numpy.max(vfrequency_map) == self.model.nchan - 1
         assert spectral_mode == 'channel'
 
     def test_w_kernel_list(self):
-        oversampling = 4
-        kernelwidth = 128
+        oversampling = 2
+        kernelwidth = 32
         kernel_indices, kernels = w_kernel_list(self.vis, self.model,
                                                 kernelwidth=kernelwidth, wstep=50, oversampling=oversampling)
         assert numpy.max(numpy.abs(kernels[0].data)) > 0.0
Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@`
`375`	`375`	`"corrupted_vis = arlexecute.client.scatter(corrupted_vis)\n",`
`376`	`376`	`"graph = create_skymodel_cal_solve_graph(corrupted_vis, calskymodel_graph, niter=30, \n",`
`377`	`377`	`" gain=0.25, tol=1e-8)\n",`
`378`		`- "calskymodel, residual_vis = arlexecute.compute(graph)"`
	`378`	`+ "calskymodel, residual_vis = arlexecute.compute(graph).result()"`
`379`	`379`	`]`
`380`	`380`	`},`
`381`	`381`	`{`