Reverted populate_test_db to previous revision.
Merge.