add now, update_time, remote_addr to stubbed mock request env
add expect json to mock request
rebuild
Merge remote-tracking branch 'upstream/master'