Fix jsonlint dependency
Better regex for define search/replace
testsuite WIP