Reworking tests and formatters