Support for scalar json results + addl tests + test renaming