Adjust some test expressions
Adjust some tests
Checking a couple more tests
Bump version number
Make it possible to output JSON test