fixed some tests, not compiles clean, still hangs... just like original ipv4 code