Updating tests for asynch - still some not passing