Fixed broken tests. Setting up new servermanager class
More work on rewriting server manager
Merge remote-tracking branch 'origin/net_restructure' into net_restructure