Remove static state from wrapper function, update comments
Fix simple deprecations
Silence encoding warning when building
Update maven version to the latest in sid
Add missing junit dependency to get tests to run with maven