Added test project for Ingest.  Started refactor.