cleanup of tests and method names around local ingest