Merge "Add unit tests for configurable network resources"