Clean up and add custom format tests