Bug fixes on network property names and code cleanup
Test coverage improvements and cleanup
Added back test coverage flush