Address issues on Sanity tests.

Change-Id: I90b8b710540d2be61a0c918c6eac6b8c8269854c
Reviewed-on: http://review.couchbase.org/25833
Reviewed-by: Ketaki Gangal <ketakigangal@gmail.com>
Tested-by: Ketaki Gangal <ketakigangal@gmail.com>