Wip/test suite no network messages