Refactored the unmatched node code and more json integration tests.