Updated cpu tests and output format