Clean up the inconsistencies with extract() in tests.