Added more format unit tests