factor out cell structure in diffs
add tests for java target