Temporary test networks
Fix unit test
Add crucial TODO