Volume fix and tests