Allow for turning off auto-extract and add a test.