Test: Added type check test for 'default'
Removed duplicated test
Fix json output not handling 'type' attributes, e.g. nested classes, especially with 'json_equivalent' method.
Merge branch 'master' into bits
Merge branch 'master' into bits