Shuffle test directory and add some test data.
Fix up unittests.  Also fixed a caching bug that was causing unittests
to fail.