Fill in format object, add testing