General configuration refinement. Switched to Java 7.
Added mockito to dependencies.