upgrade test related dependencies
Merge branch 'dev-fix-unit-tests' into dev/plosone-homepage

Conflicts:
	pom.xml