Merge PR478 in as part of the fix for failing janitor unit tests now that

the updates to default test user provisioning solves missing settings pickle.
Basically replaces most of the custom DUMMY_X with TEST_X to sue that default
test user for most tests. Obsoletes most ID collision test set up now included.

Author: jonasbardino