Added formatters
Added more tests and a few other fixes