JCBC-225-Fixes in the unit tests as per latest observations.

Change-Id: I57110c4ac84e590cd340a8f39a895cf016d32850
Reviewed-on: http://review.couchbase.org/24299
Tested-by: Deepti Dawar <deepti.dawar@globallogic.com>
Reviewed-by: Michael Nitschinger <michael.nitschinger@couchbase.com>