Changed mockito usage to new form of creating a mock. Added a helper for enum string comparisson. Changed test method name to more correctly represent what was being tested.