Continue adding unit tests ported from Java

Tests fail!