fix unit tests
Tidied dependencies
Prettify test JSON
Move JSON files out of package namespace

This is to avoid conflicts between package names and DSL terms.
Restructure JSON test files
Move JSON matching into a custom matcher