Updated the format
Updated the tests to the new format