[#1117] Tweak a unit test
[#1117] Combine three unit tests into one