Add utils and fix network
Improve tests
Apply new coding style