tests - introduce json merge after a diff
tests - json - add merged expect to assertion error details w/ ignore extra field
tests - use new json assertions mechanism
tests - fix warnings