Fixes future mapping in tests
Big refactoring, allows to add projects and tasks