Continue adding unit tests ported from Java

[ci skip] Tests still fail