Fixed a regular expression.  All tests now pass.