A couple of minor fixups

I talked with Ben about why "contains_content" was not using a contains() xpath precondition, and he couldn't tell me, so there's that. But then the multiple selection tests were failing (maybe because of a newer lettuce?), so I fixed that too.

I made the regexps a bit more restrictive, but I don't know if that is helpful.