Fixed test and network stuff,
Dear god please don't break everything MK. II