FIX: Add test