Added new spec
Some new regexps