Restored butchered test and tidy up for output of junit and with test summary