googletest

Fixed xml unit-tests and added extra tests

The extra tests check that the xml output is correct when a failure occurs before skipping, and that the right skip message is added to the file.

The json file had to be fixed because it's the same executable.