minor refactor
expect.js as dependency
Merge branch 'master' into feature/add_to_solr