Removed external resource dependency from tests, and increased test coverage.