Fix mistakes picked up by new tests
Fix mistakes picked up by new tests

I found some small discrepancies in the actual output compared to what I expected as output, so I fixed them.

NLSteveO/PunchCard,NLSteveO/PunchCard