Updated NetworkController for testing