Refactor test namespaces; ensure valueless query string key is present in stringified output