FIX: Update tests that became obsolete