Java tests pass again.
update
merged with clone