FIX: More tests