Fix warnings (all deprecations) in tests
Merge pull request #191 from gtakata/DEV2.2

Fix warnings (all deprecations) in tests