Updated the DataFormatter and added a FormatTester for testing the format