Fixed networking for new entity changes. Fixed up test classes as required.