Fixed/simplified the tests that use JMockit.