+ tests + additional volume checks

Change-Id: I2864acfcd54d516f57765529b10d1c0079e8dfc9