Rewrite tests with tape, and flesh them out a bit.