Simplify network builder
Add a real test for the network builder