Update Formatter & add tests