Update test framework with naming, non-json, keys queries