Fixing code-units bug, all tests pass.