Updating tests. POM now packages junit and mockito only for tests