Remove references to 'btree', prefer 'index' instead.
Add shuffle option to smoke. Shuffling tests gives more varied coverage
in less time (without running them all)