Added formats and some tests