refactor more tests into mocha
extract string matcher tests