Replace IP support in preparation for compiling on stable, included some tests to check that the code matches the unstable implementation