Added some regexps of varying goofiness. Tests appear to pass.