fixes to pass unit tests for network controller