complete glbranch json init test
add gldiff tests
Merge branch 'jeff-dev'