Minor test fixes for current dataset. Make use_shelves the default.

[rfrenchseti]

• Fixes #N/A
• Were any Django, import pipeline, table_schema, or dictionary files modified? Y
  • If YES:
  • Database used: New
  • All Django tests pass: Y
  • FLAKE8 run on modified code: Y
• Were any JavaScript or CSS files modified? N
  • If YES:
  • JSHINT run on all affected files: Y/NA
  • Tested on Chrome, Firefox, Safari, Edge, and iOS: Y/NA (Remember to test all browser sizes)
  • Tested for race conditions (with delayed API calls if applicable): Y/NA

Description of changes:

Minor test fixes to agree with current production data. Make --use-shelves the default and add --dont-use-shelves option.

Known problems: