Make build maven 3.1 compatible

- update dependencies
- fix two tests as result of dependency upgrades