Fix and_spec
Fix not spec
Fix or spec
Correct not_spec regex.
Use '*' instead of '+'
Merge pull request #1 from jotaki/fix_tests

Fix tests