Patch Set 4: I would prefer that you didn't submit this

- the build in Eclipse fails since org.mockito 1.8.4 does not export any packages
- the build in Maven also fails since it can't find org.mockito