Mop up Test Cases; Re-fix 1de8c137 Off-By-One Error