more tests, named more consistently
regularize test output, json