Change the package names; Update Mockito to 1.10.0; Add resources; Separate logically integration and unit tests