Test script now reflects new ingest framework, and has been cleaned up a bit.