229/1378 unit tests passing, Util unit tests still to be ported