Fixed Main and Unit Testers