FIX: Adding extra test