Minor cleanups, first network test added