FIX: Fix forward test