Clean-up weird use of cmp() -- .assertEqual(...) has better error messages.