FIX: ups, uncomment tests ...