testing non-JSON payload. Small cleanups