Tested the new code in body. AH-378

Also rewrote some tests to be better.
Merge branch 'master' into TestPlayerVolumes