Made all call into Future[Try[U]]. Updated tests