Fixed formatter log and some fixes in Main
Toughen up tests