More collision tests and updated java data