Updated networking and test class