Mockito dependency added, source/target levels set to 1.7, some rewrites.