added temp-json, cleaned tests