Updated tests to use the standard futures