Refactor test specs - obsoleted pattern matching
Merge pull request #605 from ppp0/issue-605

Deprecated style in specs