upgraded junit to 4.12
fixed mockito dependency to use mockito-core (avoiding problems with duplicate entries)