added ability to use one disk in tests

Change-Id: I0be52155f0e02feb70ccb1cfe4e7de61ac76018a