added support for pulling in test resource values
stops repeatedly adding existing overrides
clean up and minor bug fixes
removed unused method
more tests
many new tests and bug fixes