Added future with tests