Better naming, and new test

... using to compare 0.19 and 0.20 so want in both.