Extend pillowfight a bit

Change-Id: I575bcfba3951f1e5327ee0c22aae9043f28cf2db
Reviewed-on: http://review.couchbase.org/24987
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>