Fixed/simplified the tests that use JMockit.
Merge pull request #1 from rliesenfeld/master

Fixed/simplified the tests that use JMockit.