All tests now ported & passing