Add default formats and testing