FIX: Better test