test framework
more json fixes