Past tense for the epic win (and tests!)

Squashed some regexp bugs I hadn't noticed, too.