Refactored Fighter to make unit tests prettier.  Also adding control unit for Fighter