FIX: Adding future test