remove mocha.opts
npm test -> make test
don't require 'should' in tests
simplify regex