Change in test to use MockitoJUnitRunner.
Updated pom version.
Merge remote-tracking branch 'origin/develop'