Also took out all external calls to both NWIS and WQP, but added them to unit tests.