Added tests for the first formatter; Fixed some models