update formatter tests
fix issues and more enhancements