Modify the format
Adding Automated Test