Kelvin - Get code up to date with volume measurement and get first VolumeTest to pass.