make update
move json tests into its own folder
tests for inlining stuff