Some filename cleanups so thi network directory makes more sense
Added decent network test