generalize test bases
making IVolumeRepositories more similar
adjust expected messages to match rhsc-cb3