More test case fixes for #65 (no more complaints from Jenkins!)

This is all because of the changes in #65 where I fixed the off-by-one error.