Fixing calculation bug for net
Fixed unit test for net calc
Merge branch 'without-bug-fixed-test' into develop