FIX: Update obsolete tests