Interim commit. Cleanup/encapsulation
More test work
Adding tests
More tests and test cleanup
ingesthelper tests