adjust volumes, generify them, clean up unit tests a bit