Added formatters and tests
Added formatters and tests