Incorporated new formatting with test expected values