Make tests optional.

Change-Id: I80359fa3d3012c49b8bfbf81c94edcbc226c9e26