minor tweaks
refactoring to use JObject instead of stream as data for nodes/edges
forgot to commit new file
pulled additional tests
fixes after merge