Merge "Add network credential unit testing"