Fixed #6: Additional Network methods and tests, config re-organization