refactor tests to separate files
Merge pull request #68 from brettlangdon/refactor-tests

refactor tests to separate files
add support for json formatting
substring on = not {
fix merge conflict