add format, tests revisited