FIX: broken obsolete tests