Refactor: Focus on the different futures tested