replacing remaining easymock junit tests with mockito