do not merge: Replace public statics with private statics

This PR will be used for fixing the currently failing tests on travis.